Skip to content
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
10 changes: 10 additions & 0 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ jobs:
- '**'
- '!CONTRIBUTING.md'
- '!README.md'
- '!ci/release/update-version-cuopt.sh'
- '!ci/release/update-version-rapids.sh'
- '!docs/**'
- '!img/**'
- '!notebooks/**'
Expand All @@ -55,12 +57,16 @@ jobs:
- '**'
- '!CONTRIBUTING.md'
- '!README.md'
- '!ci/release/update-version-cuopt.sh'
- '!ci/release/update-version-rapids.sh'
- '!docs/**'
- '!python/nvcf_client/**'
test_python:
- '**'
- '!CONTRIBUTING.md'
- '!README.md'
- '!ci/release/update-version-cuopt.sh'
- '!ci/release/update-version-rapids.sh'
- '!docs/**'
- '!img/**'
- '!notebooks/**'
Expand All @@ -69,6 +75,8 @@ jobs:
- '**'
- '!CONTRIBUTING.md'
- '!README.md'
- '!ci/release/update-version-cuopt.sh'
- '!ci/release/update-version-rapids.sh'
- '!docs/**'
- '!img/**'
- '!notebooks/**'
Expand All @@ -79,6 +87,8 @@ jobs:
- '**'
- '!CONTRIBUTING.md'
- '!README.md'
- '!ci/release/update-version-cuopt.sh'
- '!ci/release/update-version-rapids.sh'
- '!docs/**'
- '!img/**'
- '!notebooks/**'
Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ repos:
notebooks
)
- repo: https://github.com/rapidsai/pre-commit-hooks
rev: v0.4.0
rev: v0.6.0
hooks:
- id: verify-copyright
files: |
Expand All @@ -71,7 +71,7 @@ repos:
types_or: [file]
args: ['-fallback-style=none', '-style=file', '-i']
- repo: https://github.com/rapidsai/dependency-file-generator
rev: v1.17.0
rev: v1.18.1
hooks:
- id: rapids-dependency-file-generator
args: ["--clean"]
Expand Down
2 changes: 0 additions & 2 deletions ci/build_cpp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,3 @@ sccache --show-adv-stats
# remove build_cache directory to avoid uploading the entire source tree
# tracked in https://github.com/prefix-dev/rattler-build/issues/1424
rm -rf "$RAPIDS_CONDA_BLD_OUTPUT_DIR"/build_cache

rapids-upload-conda-to-s3 cpp
2 changes: 0 additions & 2 deletions ci/build_python.sh
Original file line number Diff line number Diff line change
Expand Up @@ -90,5 +90,3 @@ rattler-build build --recipe conda/recipes/cuopt-sh-client \
# remove build_cache directory to avoid uploading the entire source tree
# tracked in https://github.com/prefix-dev/rattler-build/issues/1424
rm -rf "$RAPIDS_CONDA_BLD_OUTPUT_DIR"/build_cache

rapids-upload-conda-to-s3 python
1 change: 1 addition & 0 deletions ci/build_wheel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ package_dir=$2

source rapids-configure-sccache
source rapids-date-string
source rapids-init-pip

cd "${package_dir}"

Expand Down
15 changes: 8 additions & 7 deletions ci/build_wheel_cuopt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,25 @@


set -euo pipefail

source rapids-init-pip

package_dir="python/cuopt"
export SKBUILD_CMAKE_ARGS="-DCUOPT_BUILD_WHEELS=ON;-DDISABLE_DEPRECATION_WARNINGS=ON";

RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen "${RAPIDS_CUDA_VERSION}")"

# Download the libcuopt and cuopt-mps-parser wheel built in the previous step and make it
# available for pip to find.
# Download the packages built in the previous step
#
# Using env variable PIP_CONSTRAINT (initialized by 'rapids-init-pip') is necessary to ensure the constraints
# are used when creating the isolated build environment.
RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen "${RAPIDS_CUDA_VERSION}")"
CUOPT_MPS_PARSER_WHEELHOUSE=$(RAPIDS_PY_WHEEL_NAME="cuopt_mps_parser" rapids-download-wheels-from-github python)
LIBCUOPT_WHEELHOUSE=$(RAPIDS_PY_WHEEL_NAME="libcuopt_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-github cpp)

echo "libcuopt-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo ${LIBCUOPT_WHEELHOUSE}/libcuopt_*.whl)" >> /tmp/constraints.txt
echo "cuopt-mps-parser @ file://$(echo ${CUOPT_MPS_PARSER_WHEELHOUSE}/cuopt_mps_parser*.whl)" >> /tmp/constraints.txt
export PIP_CONSTRAINT="/tmp/constraints.txt"

echo "libcuopt-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo ${LIBCUOPT_WHEELHOUSE}/libcuopt_*.whl)" >> "${PIP_CONSTRAINT}"
echo "cuopt-mps-parser @ file://$(echo ${CUOPT_MPS_PARSER_WHEELHOUSE}/cuopt_mps_parser*.whl)" >> "${PIP_CONSTRAINT}"

EXCLUDE_ARGS=(
--exclude "libraft.so"
Expand All @@ -53,5 +56,3 @@ ci/build_wheel.sh cuopt ${package_dir}
python -m auditwheel repair "${EXCLUDE_ARGS[@]}" -w ${RAPIDS_WHEEL_BLD_OUTPUT_DIR} ${package_dir}/dist/*

ci/validate_wheel.sh "${package_dir}" "${RAPIDS_WHEEL_BLD_OUTPUT_DIR}"

RAPIDS_PY_WHEEL_NAME="cuopt_${RAPIDS_PY_CUDA_SUFFIX}" rapids-upload-wheels-to-s3 python "${RAPIDS_WHEEL_BLD_OUTPUT_DIR}"
4 changes: 2 additions & 2 deletions ci/build_wheel_cuopt_mps_parser.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@

set -euo pipefail

source rapids-init-pip

package_dir="python/cuopt/cuopt/linear_programming"

export SKBUILD_CMAKE_ARGS="-DCUOPT_BUILD_WHEELS=ON;-DDISABLE_DEPRECATION_WARNINGS=ON"
Expand All @@ -35,5 +37,3 @@ ci/build_wheel.sh cuopt_mps_parser ${package_dir}
python -m auditwheel repair -w "${RAPIDS_WHEEL_BLD_OUTPUT_DIR}" ${package_dir}/dist/*

ci/validate_wheel.sh "${package_dir}" "${RAPIDS_WHEEL_BLD_OUTPUT_DIR}"

RAPIDS_PY_WHEEL_NAME="cuopt_mps_parser" rapids-upload-wheels-to-s3 python "${RAPIDS_WHEEL_BLD_OUTPUT_DIR}"
6 changes: 2 additions & 4 deletions ci/build_wheel_cuopt_server.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.


set -euo pipefail

source rapids-init-pip

package_dir="python/cuopt_server"

ci/build_wheel.sh cuopt_server ${package_dir}
cp "${package_dir}/dist"/* "${RAPIDS_WHEEL_BLD_OUTPUT_DIR}/"
ci/validate_wheel.sh "${package_dir}" "${RAPIDS_WHEEL_BLD_OUTPUT_DIR}"

RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen "${RAPIDS_CUDA_VERSION}")"
RAPIDS_PY_WHEEL_NAME="cuopt_server_${RAPIDS_PY_CUDA_SUFFIX}" rapids-upload-wheels-to-s3 python "${RAPIDS_WHEEL_BLD_OUTPUT_DIR}"
4 changes: 2 additions & 2 deletions ci/build_wheel_cuopt_sh_client.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@

set -euo pipefail

source rapids-init-pip

package_dir="python/cuopt_self_hosted"

ci/build_wheel.sh cuopt_sh_client ${package_dir}
cp "${package_dir}/dist"/* "${RAPIDS_WHEEL_BLD_OUTPUT_DIR}/"
ci/validate_wheel.sh "${package_dir}" "${RAPIDS_WHEEL_BLD_OUTPUT_DIR}"

RAPIDS_PY_WHEEL_NAME="cuopt_sh_client" rapids-upload-wheels-to-s3 python "${RAPIDS_WHEEL_BLD_OUTPUT_DIR}"
7 changes: 2 additions & 5 deletions ci/build_wheel_libcuopt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

set -euo pipefail

source rapids-init-pip

package_name="libcuopt"
package_dir="python/libcuopt"

Expand All @@ -29,11 +31,8 @@ else
echo "Building in release mode"
fi

RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})"

rapids-logger "Generating build requirements"

RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen "${RAPIDS_CUDA_VERSION}")"
CUOPT_MPS_PARSER_WHEELHOUSE=$(RAPIDS_PY_WHEEL_NAME="cuopt_mps_parser" rapids-download-wheels-from-github python)
echo "cuopt-mps-parser @ file://$(echo ${CUOPT_MPS_PARSER_WHEELHOUSE}/cuopt_mps_parser*.whl)" >> /tmp/constraints.txt
export PIP_CONSTRAINT="/tmp/constraints.txt"
Expand Down Expand Up @@ -75,5 +74,3 @@ mkdir -p final_dist
python -m auditwheel repair "${EXCLUDE_ARGS[@]}" -w "${RAPIDS_WHEEL_BLD_OUTPUT_DIR}" ${package_dir}/dist/*

ci/validate_wheel.sh ${package_dir} "${RAPIDS_WHEEL_BLD_OUTPUT_DIR}"

RAPIDS_PY_WHEEL_NAME="libcuopt_${RAPIDS_PY_CUDA_SUFFIX}" rapids-upload-wheels-to-s3 cpp "${RAPIDS_WHEEL_BLD_OUTPUT_DIR}"
2 changes: 2 additions & 0 deletions ci/test_self_hosted_service.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@

set -euo pipefail

source rapids-init-pip

# Download the cuopt built in the previous step
RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen "${RAPIDS_CUDA_VERSION}")"
CUOPT_MPS_PARSER_WHEELHOUSE=$(RAPIDS_PY_WHEEL_NAME="cuopt_mps_parser" rapids-download-wheels-from-github python)
Expand Down
3 changes: 1 addition & 2 deletions ci/test_wheel_cuopt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@

set -euo pipefail

mkdir -p ./dist
RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen "${RAPIDS_CUDA_VERSION}")"
source rapids-init-pip

# Download the packages built in the previous step
RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen "${RAPIDS_CUDA_VERSION}")"
Expand Down
3 changes: 1 addition & 2 deletions ci/test_wheel_cuopt_server.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@

set -eou pipefail

mkdir -p ./dist
RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen "${RAPIDS_CUDA_VERSION}")"
source rapids-init-pip

# Download the packages built in the previous step
RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen "${RAPIDS_CUDA_VERSION}")"
Expand Down