From a9e508a8d1a7a9e5ef5373de71220e504aede836 Mon Sep 17 00:00:00 2001 From: Christopher Harris Date: Thu, 13 Apr 2023 10:38:51 -0500 Subject: [PATCH 1/3] python 3.10 --- Dockerfile | 7 +++---- README.md | 6 +++--- ci/conda/environments/dev_env.yml | 6 +++--- ci/conda/recipes/libmrc/conda_build_config.yaml | 2 +- ci/conda/recipes/libmrc/meta.yaml | 2 +- ci/conda/recipes/run_conda_build.sh | 4 ++-- docs/quickstart/environment_cpp.yml | 4 ++-- docs/quickstart/hybrid/setup.cfg | 2 +- docs/quickstart/python/setup.cfg | 2 +- external/utilities | 2 +- python/mrc/_pymrc/CMakeLists.txt | 2 +- python/mrc/_pymrc/include/pymrc/logging.hpp | 2 +- python/setup.py | 3 +-- 13 files changed, 21 insertions(+), 23 deletions(-) diff --git a/Dockerfile b/Dockerfile index eb0cafa8d..cae834533 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,10 +20,10 @@ ARG FROM_IMAGE="rapidsai/ci" ARG CUDA_VER=11.8.0 ARG LINUX_DISTRO=ubuntu ARG LINUX_VER=20.04 -ARG PYTHON_VER=3.8 +ARG PYTHON_VER=3.10 # ============= base =================== -FROM ${FROM_IMAGE}:cuda11.8.0-ubuntu20.04-py3.8 AS base +FROM ${FROM_IMAGE}:cuda11.8.0-ubuntu20.04-py3.10 AS base ARG PROJ_NAME=mrc @@ -98,8 +98,7 @@ ARG USERNAME=morpheus ARG USER_UID=1000 ARG USER_GID=$USER_UID -RUN groupadd --gid $USER_GID $USERNAME && \ - useradd --uid $USER_UID --gid $USER_GID -m $USERNAME && \ +RUN useradd --uid $USER_UID --gid $USER_GID -m $USERNAME && \ usermod --shell /bin/bash $USERNAME && \ echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME && \ chmod 0440 /etc/sudoers.d/$USERNAME && \ diff --git a/README.md b/README.md index 61bfe745a..c7180c15f 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ If you choose to use Mamba rather than Conda, simply replace `conda` with `mamba #### Python Bindings ```bash # If needed, create a new conda environment -conda create --name mrc python=3.8 +conda create --name mrc python=3.10 # Activate the newly created conda environment conda activate mrc @@ -69,7 +69,7 @@ conda install -c rapidsai -c nvidia -c conda-forge mrc #### C++ Bindings ```bash # If needed, create a new conda environment -conda create --name mrc python=3.8 +conda create --name mrc python=3.10 # Activate the newly created conda environment conda activate mrc @@ -81,7 +81,7 @@ conda install -c rapidsai -c nvidia -c conda-forge libmrc #### Full MRC Library ```bash # If needed, create a new conda environment -conda create --name mrc python=3.8 +conda create --name mrc python=3.10 # Activate the newly created conda environment conda activate mrc diff --git a/ci/conda/environments/dev_env.yml b/ci/conda/environments/dev_env.yml index c0d3e590f..c639ed62e 100644 --- a/ci/conda/environments/dev_env.yml +++ b/ci/conda/environments/dev_env.yml @@ -12,7 +12,7 @@ dependencies: - cmake=3.24 - cuda-nvml-dev=11.8 - cudatoolkit=11.8 - - cython=0.29.24 + - cython>=0.29,<0.30 - doxygen=1.9.2 - flatbuffers=2.0 - gcc_linux-64=11.2 @@ -36,12 +36,12 @@ dependencies: - ninja=1.10 - nlohmann_json=3.9 - numactl-libs-cos7-x86_64 - - numpy=1.21.2 + - numpy>=1.21 - nvcc_linux-64=11.8 - pip - pkg-config=0.29 - pybind11-stubgen=0.10 - - python=3.8 + - python=3.10 - scikit-build>=0.12 - spdlog=1.8.5 - sysroot_linux-64=2.17 diff --git a/ci/conda/recipes/libmrc/conda_build_config.yaml b/ci/conda/recipes/libmrc/conda_build_config.yaml index 90de529da..334a78ea4 100644 --- a/ci/conda/recipes/libmrc/conda_build_config.yaml +++ b/ci/conda/recipes/libmrc/conda_build_config.yaml @@ -26,8 +26,8 @@ cuda_compiler_version: - 11.8 python: - - 3.8 - 3.9 + - 3.10 # Setup the dependencies to build with multiple versions of RAPIDS rapids_version: # Keep around compatibility with current version -1 diff --git a/ci/conda/recipes/libmrc/meta.yaml b/ci/conda/recipes/libmrc/meta.yaml index fb742a60a..818419539 100644 --- a/ci/conda/recipes/libmrc/meta.yaml +++ b/ci/conda/recipes/libmrc/meta.yaml @@ -15,7 +15,7 @@ {% set version = environ.get('GIT_VERSION', '0.0.0.dev').lstrip('v') + environ.get('VERSION_SUFFIX', '') %} {% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %} -{% set py_version = environ.get('CONDA_PY', '3.8') %} +{% set py_version = environ.get('CONDA_PY', '3.10') %} {% set cuda_version = '.'.join(environ.get('CUDA', '11.8').split('.')[:2]) %} {% set cuda_major = cuda_version.split('.')[0] %} diff --git a/ci/conda/recipes/run_conda_build.sh b/ci/conda/recipes/run_conda_build.sh index e0ed9ab94..5c2c4b881 100755 --- a/ci/conda/recipes/run_conda_build.sh +++ b/ci/conda/recipes/run_conda_build.sh @@ -99,9 +99,9 @@ fi # Choose default variants if hasArg quick; then # For quick build, just do most recent version of rapids - CONDA_ARGS_ARRAY+=("--variants" "{python: 3.8, rapids_version: 23.02}") + CONDA_ARGS_ARRAY+=("--variants" "{python: 3.10, rapids_version: 23.02}") else - CONDA_ARGS_ARRAY+=("--variants" "{python: 3.8}") + CONDA_ARGS_ARRAY+=("--variants" "{python: 3.10}") fi # And default channels diff --git a/docs/quickstart/environment_cpp.yml b/docs/quickstart/environment_cpp.yml index d81c1dbc2..dd72cfca9 100644 --- a/docs/quickstart/environment_cpp.yml +++ b/docs/quickstart/environment_cpp.yml @@ -25,10 +25,10 @@ dependencies: - libtool - ninja=1.10 - numactl-libs-cos7-x86_64 - - numpy=1.21.2 + - numpy>=1.21 - nvcc_linux-64=11.8 - pkg-config=0.29 - - python=3.8 + - python=3.10 - scikit-build>=0.12 - spdlog=1.8.5 - mrc=23.07 diff --git a/docs/quickstart/hybrid/setup.cfg b/docs/quickstart/hybrid/setup.cfg index 61fd95a25..d09a775dd 100644 --- a/docs/quickstart/hybrid/setup.cfg +++ b/docs/quickstart/hybrid/setup.cfg @@ -23,7 +23,7 @@ classifiers = Intended Audience :: Developers Programming Language :: Python Programming Language :: Python :: 3.8 - Programming Language :: Python :: 3.9 + Programming Language :: Python :: 3.10 [options] zip_safe = False diff --git a/docs/quickstart/python/setup.cfg b/docs/quickstart/python/setup.cfg index d63ec1a90..5182758e7 100644 --- a/docs/quickstart/python/setup.cfg +++ b/docs/quickstart/python/setup.cfg @@ -23,7 +23,7 @@ classifiers = Intended Audience :: Developers Programming Language :: Python Programming Language :: Python :: 3.8 - Programming Language :: Python :: 3.9 + Programming Language :: Python :: 3.10 [options] zip_safe = False diff --git a/external/utilities b/external/utilities index c6341650a..b5a53cf77 160000 --- a/external/utilities +++ b/external/utilities @@ -1 +1 @@ -Subproject commit c6341650a15cf9dc1d0f47385a125668b4930a10 +Subproject commit b5a53cf77c9c9e9406939f1e6bbc163ba16b0f0f diff --git a/python/mrc/_pymrc/CMakeLists.txt b/python/mrc/_pymrc/CMakeLists.txt index e3314f550..0a03644ed 100644 --- a/python/mrc/_pymrc/CMakeLists.txt +++ b/python/mrc/_pymrc/CMakeLists.txt @@ -12,7 +12,7 @@ # the License. # ============================================================================= -find_package(Python 3.8 REQUIRED COMPONENTS Development Interpreter) +find_package(Python 3.10 REQUIRED COMPONENTS Development Interpreter) find_package(pybind11 REQUIRED) find_package(prometheus-cpp REQUIRED) diff --git a/python/mrc/_pymrc/include/pymrc/logging.hpp b/python/mrc/_pymrc/include/pymrc/logging.hpp index 8fbe00502..d0d72532c 100644 --- a/python/mrc/_pymrc/include/pymrc/logging.hpp +++ b/python/mrc/_pymrc/include/pymrc/logging.hpp @@ -25,7 +25,7 @@ namespace mrc::pymrc { /** * @brief Python's logging lib is a pure-python impl, as such the log levels are not defined * in the C API. - * https://docs.python.org/3.8/library/logging.html#logging-levels + * https://docs.python.org/3.10/library/logging.html#logging-levels */ namespace py_log_levels { constexpr int NOTSET = 0; diff --git a/python/setup.py b/python/setup.py index 717d81e3c..5c19c6b73 100644 --- a/python/setup.py +++ b/python/setup.py @@ -29,9 +29,8 @@ classifiers=[ "Intended Audience :: Developers", "Programming Language :: Python", - "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", - "Programming Language :: Python :: 3.9" + "Programming Language :: Python :: 3.10" ], author="NVIDIA Corporation", setup_requires=[], From f5d029b22de597e0d211de9d80b6b704ef81e8bb Mon Sep 17 00:00:00 2001 From: Christopher Harris Date: Thu, 13 Apr 2023 17:45:55 +0000 Subject: [PATCH 2/3] drop python 3.8 support --- ci/conda/recipes/libmrc/conda_build_config.yaml | 6 ------ ci/conda/recipes/run_conda_build.sh | 4 +--- docs/quickstart/hybrid/setup.cfg | 1 - docs/quickstart/python/setup.cfg | 1 - python/setup.py | 1 - 5 files changed, 1 insertion(+), 12 deletions(-) diff --git a/ci/conda/recipes/libmrc/conda_build_config.yaml b/ci/conda/recipes/libmrc/conda_build_config.yaml index 334a78ea4..5baf41c30 100644 --- a/ci/conda/recipes/libmrc/conda_build_config.yaml +++ b/ci/conda/recipes/libmrc/conda_build_config.yaml @@ -26,12 +26,10 @@ cuda_compiler_version: - 11.8 python: - - 3.9 - 3.10 # Setup the dependencies to build with multiple versions of RAPIDS rapids_version: # Keep around compatibility with current version -1 - - 22.08 - 22.10 - 23.02 @@ -40,22 +38,18 @@ rapids_version: # Keep around compatibility with current version -1 # 1.46. For each version of gRPC, support 2 abseil versions. Zip all of the keys # together to avoid impossible combinations libabseil: - - 20220623.0 - 20220623.0 - 20230125.0 grpc_cpp: - - 1.46 - 1.46 - 1.51 ucx: - 1.13 - 1.13 - - 1.13 libprotobuf: - - 3.20 - 3.20 - 3.21 diff --git a/ci/conda/recipes/run_conda_build.sh b/ci/conda/recipes/run_conda_build.sh index 5c2c4b881..365d38c27 100755 --- a/ci/conda/recipes/run_conda_build.sh +++ b/ci/conda/recipes/run_conda_build.sh @@ -99,9 +99,7 @@ fi # Choose default variants if hasArg quick; then # For quick build, just do most recent version of rapids - CONDA_ARGS_ARRAY+=("--variants" "{python: 3.10, rapids_version: 23.02}") -else - CONDA_ARGS_ARRAY+=("--variants" "{python: 3.10}") + CONDA_ARGS_ARRAY+=("rapids_version: 23.02}") fi # And default channels diff --git a/docs/quickstart/hybrid/setup.cfg b/docs/quickstart/hybrid/setup.cfg index d09a775dd..ebc3e2d13 100644 --- a/docs/quickstart/hybrid/setup.cfg +++ b/docs/quickstart/hybrid/setup.cfg @@ -22,7 +22,6 @@ license = Apache classifiers = Intended Audience :: Developers Programming Language :: Python - Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.10 [options] diff --git a/docs/quickstart/python/setup.cfg b/docs/quickstart/python/setup.cfg index 5182758e7..fa7fc2a0e 100644 --- a/docs/quickstart/python/setup.cfg +++ b/docs/quickstart/python/setup.cfg @@ -22,7 +22,6 @@ license = Apache classifiers = Intended Audience :: Developers Programming Language :: Python - Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.10 [options] diff --git a/python/setup.py b/python/setup.py index 5c19c6b73..06290d062 100644 --- a/python/setup.py +++ b/python/setup.py @@ -29,7 +29,6 @@ classifiers=[ "Intended Audience :: Developers", "Programming Language :: Python", - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.10" ], author="NVIDIA Corporation", From b5bd6f53f363879795d9cb12e8e7f2940167c07b Mon Sep 17 00:00:00 2001 From: Christopher Harris Date: Thu, 13 Apr 2023 13:04:21 -0500 Subject: [PATCH 3/3] styles --- python/setup.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/python/setup.py b/python/setup.py index 06290d062..ae7a60876 100644 --- a/python/setup.py +++ b/python/setup.py @@ -27,9 +27,7 @@ description="mrc", version=versioneer.get_version(), classifiers=[ - "Intended Audience :: Developers", - "Programming Language :: Python", - "Programming Language :: Python :: 3.10" + "Intended Audience :: Developers", "Programming Language :: Python", "Programming Language :: Python :: 3.10" ], author="NVIDIA Corporation", setup_requires=[],