Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Python 3.10 #317

Merged
merged 3 commits into from
Apr 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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 && \
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions ci/conda/environments/dev_env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
8 changes: 1 addition & 7 deletions ci/conda/recipes/libmrc/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,10 @@ 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
- 22.08
- 22.10
- 23.02

Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion ci/conda/recipes/libmrc/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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] %}

Expand Down
4 changes: 1 addition & 3 deletions ci/conda/recipes/run_conda_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.8, rapids_version: 23.02}")
else
CONDA_ARGS_ARRAY+=("--variants" "{python: 3.8}")
CONDA_ARGS_ARRAY+=("rapids_version: 23.02}")
fi

# And default channels
Expand Down
4 changes: 2 additions & 2 deletions docs/quickstart/environment_cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions docs/quickstart/hybrid/setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ license = Apache
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
Expand Down
3 changes: 1 addition & 2 deletions docs/quickstart/python/setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ license = Apache
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
Expand Down
2 changes: 1 addition & 1 deletion external/utilities
Submodule utilities updated 0 files
2 changes: 1 addition & 1 deletion python/mrc/_pymrc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion python/mrc/_pymrc/include/pymrc/logging.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 1 addition & 5 deletions python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,7 @@
description="mrc",
version=versioneer.get_version(),
classifiers=[
"Intended Audience :: Developers",
"Programming Language :: Python",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9"
"Intended Audience :: Developers", "Programming Language :: Python", "Programming Language :: Python :: 3.10"
],
author="NVIDIA Corporation",
setup_requires=[],
Expand Down