Merge remote-tracking branch 'upstream/main' into add-conda-packages

rapidsai · Jan 5, 2024 · 8da5db6 · 8da5db6
2 parents e7a4ccf + ce20b81
commit 8da5db6
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -10,16 +10,17 @@ work-in-progress.
 TODO
 
 ## Install pynvjitlink
+
 Install with either:
 
-```
-python setup.py develop
+```shell
+python -m pip install -e .
 ```
 
 or
 
-```
-python setup.py install
+```shell
+python -m pip install .
 ```
 
 ### Conda

diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh
@@ -1,13 +1,11 @@
 #!/bin/bash
-# Copyright (c) 2023, NVIDIA CORPORATION
+# Copyright (c) 2023-2024, NVIDIA CORPORATION
 
+set -euo pipefail
 
 rapids-logger "Install CUDA Toolkit"
 source "$(dirname "$0")/install_latest_cuda_toolkit.sh"
 
-rapids-logger "Check conda environment"
-conda list
-
 rapids-logger "Build wheel"
 mkdir -p ./wheel-build
 pip wheel . --wheel-dir=./wheel-build -vvv

diff --git a/ci/install_latest_cuda_toolkit.sh b/ci/install_latest_cuda_toolkit.sh
@@ -4,7 +4,7 @@
 # Installs the latest CUDA Toolkit.
 # Supports CentOS 7 and Rocky Linux 8.
 
-yum update
+yum update -y
 yum install -y epel-release
 
 OS_ID=$(. /etc/os-release; echo $ID)

diff --git a/ci/test_wheel.sh b/ci/test_wheel.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Copyright (c) 2023, NVIDIA CORPORATION
+# Copyright (c) 2023-2024, NVIDIA CORPORATION
 
-set -e
+set -euo pipefail
 
 rapids-logger "Download Wheel"
 RAPIDS_PY_WHEEL_NAME="pynvjitlink-cu12" rapids-download-wheels-from-s3 ./wheel-build/