Self-review updates.

rapidsai · Jan 10, 2024 · e395176 · e395176
1 parent 86c12b0
commit e395176
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 28 deletions.
diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh
@@ -12,10 +12,8 @@ RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})"
 # everywhere except in the final wheel name.
 PACKAGE_CUDA_SUFFIX="-${RAPIDS_PY_CUDA_SUFFIX}"
 
-# Patch project metadata files to include the CUDA version suffix and version override.
-pyproject_file="${package_dir}/pyproject.toml"
-
-sed -i "s/^name = \"${package_name}\"/name = \"${package_name}${PACKAGE_CUDA_SUFFIX}\"/g" ${pyproject_file}
+# Patch project metadata files to include the CUDA version suffix.
+sed -i "s/^name = \"${package_name}\"/name = \"${package_name}${PACKAGE_CUDA_SUFFIX}\"/g" pyproject.toml
 
 rapids-logger "Build wheel"
 mkdir -p ./dist

diff --git a/ci/test_conda.sh b/ci/test_conda.sh
@@ -22,7 +22,7 @@ set +u
 conda activate test
 set -u
 
-#PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python)
+PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python)
 RAPIDS_TESTS_DIR=${RAPIDS_TESTS_DIR:-"${PWD}/test-results"}/
 mkdir -p "${RAPIDS_TESTS_DIR}"
 

diff --git a/conda/recipes/pynvjitlink/conda_build_config.yaml b/conda/recipes/pynvjitlink/conda_build_config.yaml
@@ -7,5 +7,5 @@ cxx_compiler_version:
 cuda_compiler:
   - cuda-nvcc
 
-cuda_version:
-  - "=12.2"
+cuda_compiler_version:
+  - 12
diff --git a/conda/recipes/pynvjitlink/meta.yaml b/conda/recipes/pynvjitlink/meta.yaml
@@ -18,14 +18,14 @@ requirements:
     - {{ compiler('c') }}
     - {{ compiler('cxx') }}
     - {{ compiler('cuda') }}
-    - cuda-version {{ cuda_version }}
+    - cuda-version {{ cuda_compiler_version }}
     - cmake >=3.26.4
     - ninja
     - sysroot_{{ target_platform }} 2.17
   host:
     - libnvjitlink-dev
     - libnvjitlink-static
-    - cuda-version {{ cuda_version }}
+    - cuda-version {{ cuda_compiler_version }}
     - python
     - pip
     - scikit-build-core
@@ -34,25 +34,6 @@ requirements:
     - numba >=0.57
     - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
 
-#test:
-#  #imports:
-#  #  - pynvjitlink
-#  source_files:
-#    - pynvjitlink/tests/test_patch.py
-#    - pynvjitlink/tests/test_pynvjitlink.py
-#    - pynvjitlink/tests/test_pynvjitlink_api.py
-#    - test_binary_generation/*
-#  requires:
-#    - {{ compiler('c') }}
-#    - {{ compiler('cxx') }}
-#    - {{ compiler('cuda') }}
-#    - cuda-version ={{ cuda_version }}
-#    - make
-#    - pytest
-#  commands:
-#    - pushd test_binary_generation && make && popd
-#    - pytest -v
-
 about:
   home: https://rapids.ai/
   dev_url: https://github.com/rapidsai/pynvjitlink