From a4f69f7bcd9db4375d4cc7cb5d42ed84172cf79c Mon Sep 17 00:00:00 2001 From: Charles Hastings Date: Wed, 6 Dec 2023 09:09:28 -0800 Subject: [PATCH] remove references to pascal in CI scripts --- ci/notebook_list.py | 7 ------- ci/test.sh | 4 +--- ci/utils/is_pascal.py | 37 ------------------------------------- 3 files changed, 1 insertion(+), 47 deletions(-) delete mode 100644 ci/utils/is_pascal.py diff --git a/ci/notebook_list.py b/ci/notebook_list.py index 96e26e3ab1a..f7a284beeeb 100644 --- a/ci/notebook_list.py +++ b/ci/notebook_list.py @@ -42,7 +42,6 @@ def skip_book_dir(runtype): # Not strictly true... however what we mean is # Pascal or earlier # -pascal = False ampere = False device = cuda.get_current_device() @@ -62,8 +61,6 @@ def skip_book_dir(runtype): cc = getattr(device, "COMPUTE_CAPABILITY", None) or getattr( device, "compute_capability" ) -if cc[0] < 7: - pascal = True if cc[0] >= 8: ampere = True @@ -91,10 +88,6 @@ def skip_book_dir(runtype): ) skip = True break - elif pascal and re.search("# Does not run on Pascal", line): - print(f"SKIPPING {filename} (does not run on Pascal)", file=sys.stderr) - skip = True - break elif ampere and re.search("# Does not run on Ampere", line): print(f"SKIPPING {filename} (does not run on Ampere)", file=sys.stderr) skip = True diff --git a/ci/test.sh b/ci/test.sh index 0032e3f3398..b3adc80c593 100755 --- a/ci/test.sh +++ b/ci/test.sh @@ -63,9 +63,7 @@ fi # EXITCODE for the script. set +e -if (python ${CUGRAPH_ROOT}/ci/utils/is_pascal.py); then - echo "WARNING: skipping C++ tests on Pascal GPU arch." -elif hasArg "--run-cpp-tests"; then +if hasArg "--run-cpp-tests"; then echo "C++ gtests for cuGraph (single-GPU only)..." for gt in "${CONDA_PREFIX}/bin/gtests/libcugraph/"*_TEST; do test_name=$(basename $gt) diff --git a/ci/utils/is_pascal.py b/ci/utils/is_pascal.py deleted file mode 100644 index e716f59422f..00000000000 --- a/ci/utils/is_pascal.py +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright (c) 2021-2023, NVIDIA CORPORATION. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import re -import sys -import glob - -from numba import cuda - -# FIXME: consolidate this code with ci/gpu/notebook_list.py - -# -# Not strictly true... however what we mean is -# Pascal or earlier -# -pascal = False - -device = cuda.get_current_device() -cc = device.compute_capability -if (cc[0] < 7): - pascal = True - -# Return zero (success) if pascal is True -if pascal: - sys.exit(0) -else: - sys.exit(1)