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

Adopt Rapids 25.02 #536

Merged
merged 14 commits into from
Feb 11, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
WIP
  • Loading branch information
dagardner-nv committed Feb 1, 2025
commit 5d962ef9a13d9ea2849e4ff61d70a63aea1717fb
4 changes: 2 additions & 2 deletions .devcontainer/opt/mrc/bin/post-attach-command.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ sed -ri "s/conda activate base/conda activate $ENV_NAME/g" ~/.bashrc;

if conda_env_find "${ENV_NAME}" ; \

then mamba env update --name ${ENV_NAME} -f ${MRC_ROOT}/conda/environments/all_cuda-125_arch-x86_64.yaml --prune; \
else mamba env create --name ${ENV_NAME} -f ${MRC_ROOT}/conda/environments/all_cuda-125_arch-x86_64.yaml; \
then mamba env update --name ${ENV_NAME} -f ${MRC_ROOT}/conda/environments/all_cuda-128_arch-x86_64.yaml --prune; \
else mamba env create --name ${ENV_NAME} -f ${MRC_ROOT}/conda/environments/all_cuda-128_arch-x86_64.yaml; \
fi
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ cd $MRC_ROOT
#### Create MRC Conda environment
```bash
# note: `mamba` may be used in place of `conda` for better performance.
conda env create -n mrc --file $MRC_ROOT/conda/environments/all_cuda-125_arch-x86_64.yaml
conda env create -n mrc --file $MRC_ROOT/conda/environments/all_cuda-128_arch-x86_64.yaml
dagardner-nv marked this conversation as resolved.
Show resolved Hide resolved
conda activate mrc
```
#### Build MRC
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,14 @@ RUN useradd --uid $USER_UID --gid $USER_GID -m $USERNAME && \
echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME && \
chmod 0440 /etc/sudoers.d/$USERNAME

COPY ./conda/environments/all_cuda-125_arch-${REAL_ARCH}.yaml /opt/mrc/conda/environments/all_cuda-125_arch-${REAL_ARCH}.yaml
COPY ./conda/environments/all_cuda-128_arch-${REAL_ARCH}.yaml /opt/mrc/conda/environments/all_cuda-128_arch-${REAL_ARCH}.yaml

RUN --mount=type=cache,target=/opt/conda/pkgs,sharing=locked,id=conda_cache-${REAL_ARCH} \
echo "create env: ${PROJ_NAME}" && \
sudo -g conda -u $USERNAME \
CONDA_ALWAYS_YES=true \
/opt/conda/bin/conda env create --solver=libmamba -q -n ${PROJ_NAME} \
--file /opt/mrc/conda/environments/all_cuda-125_arch-${REAL_ARCH}.yaml && \
--file /opt/mrc/conda/environments/all_cuda-128_arch-${REAL_ARCH}.yaml && \
chmod -R a+rwX /opt/conda && \
rm -rf /tmp/conda

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ cd $MRC_ROOT
#### Create MRC Conda Environment
```bash
# note: `mamba` may be used in place of `conda` for better performance.
conda env create -n mrc-dev --file $MRC_ROOT/conda/environments/all_cuda-125_arch-x86_64.yaml
conda env create -n mrc-dev --file $MRC_ROOT/conda/environments/all_cuda-128_arch-$(arch).yaml
dagardner-nv marked this conversation as resolved.
Show resolved Hide resolved
conda activate mrc-dev
```
<!-- omit in toc -->
Expand Down
2 changes: 1 addition & 1 deletion ci/conda/recipes/libmrc/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ cuda_compiler:
- cuda-nvcc

cuda_compiler_version:
- 12.5
- 12.8

python:
- 3.10
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 py_version = environ.get('CONDA_PY', '3.10') %}
{% set cuda_version = '.'.join(environ.get('CUDA', '12.5').split('.')[:2]) %}
{% set cuda_version = '.'.join(environ.get('CUDA', '12.8').split('.')[:2]) %}

package:
name: libmrc-split
Expand Down
2 changes: 1 addition & 1 deletion ci/release/download_deps.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ def main():
conda_json_cmd = CONDA_JSON_CMD.format(mrc_version=mrc_version)
args = parse_args(conda_json_cmd=conda_json_cmd,
default_conda_yaml=os.path.join(PROJ_ROOT,
"conda/environments/runtime_cuda-125_arch-x86_64.yaml"),
"conda/environments/runtime_cuda-128_arch-x86_64.yaml"),
default_conda_json=os.path.join(PROJ_ROOT, ".tmp/conda_env_pkgs.json"))
log_level = logging._nameToLevel[args.log_level.upper()]
logging.basicConfig(level=log_level, format="%(message)s")
Expand Down
2 changes: 1 addition & 1 deletion ci/scripts/github/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ id

export BUILD_CC=${BUILD_CC:-"gcc"}

export CONDA_ENV_YML="${MRC_ROOT}/conda/environments/all_cuda-125_arch-${REAL_ARCH}.yaml"
export CONDA_ENV_YML="${MRC_ROOT}/conda/environments/all_cuda-128_arch-${REAL_ARCH}.yaml"

export CMAKE_BUILD_ALL_FEATURES="-DCMAKE_MESSAGE_CONTEXT_SHOW=ON -DMRC_BUILD_BENCHMARKS=ON -DMRC_BUILD_EXAMPLES=ON -DMRC_BUILD_PYTHON=ON -DMRC_BUILD_TESTS=ON -DMRC_USE_CONDA=ON -DMRC_PYTHON_BUILD_STUBS=ON"
export CMAKE_BUILD_WITH_CODECOV="-DCMAKE_BUILD_TYPE=Debug -DMRC_ENABLE_CODECOV=ON -DMRC_PYTHON_PERFORM_INSTALL:BOOL=ON -DMRC_PYTHON_INPLACE_BUILD:BOOL=ON"
Expand Down
2 changes: 1 addition & 1 deletion ci/scripts/run_ci_local.sh
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ GIT_COMMIT=$(git log -n 1 --pretty=format:%H)

BASE_LOCAL_CI_TMP=${BASE_LOCAL_CI_TMP:-${MRC_ROOT}/.tmp/local_ci_tmp}
CONTAINER_VER=${CONTAINER_VER:-241219}
CUDA_VER=${CUDA_VER:-12.5}
CUDA_VER=${CUDA_VER:-12.8}
DOCKER_EXTRA_ARGS=${DOCKER_EXTRA_ARGS:-""}

BUILD_CONTAINER="nvcr.io/ea-nvidia-morpheus/morpheus:mrc-ci-build-${CONTAINER_VER}"
Expand Down