From 1202c36c0b27e342dc6f0a9ac95c01050e2064aa Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 29 Oct 2024 13:07:03 -0700 Subject: [PATCH] remove unnecessary channel for builds, use CI instead of CI_RUN, consolidate gitignore --- .gitignore | 1 - ci/build_python.sh | 2 -- ci/run_cugraph_pyg_pytests.sh | 2 +- ci/test_wheel_cugraph-pyg.sh | 3 --- python/cugraph-pyg/cugraph_pyg/examples/gcn_dist_mnmg.py | 2 +- python/cugraph-pyg/cugraph_pyg/examples/gcn_dist_sg.py | 4 ++-- python/cugraph-pyg/cugraph_pyg/examples/gcn_dist_snmg.py | 4 ++-- .../cugraph-pyg/cugraph_pyg/examples/rgcn_link_class_mnmg.py | 2 +- python/cugraph-pyg/cugraph_pyg/examples/rgcn_link_class_sg.py | 2 +- .../cugraph-pyg/cugraph_pyg/examples/rgcn_link_class_snmg.py | 4 ++-- 10 files changed, 10 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 7095ae9..4f4b952 100644 --- a/.gitignore +++ b/.gitignore @@ -70,7 +70,6 @@ cpp/thirdparty/googletest/ *.iws ## Datasets -dataset/ datasets/ !datasets/cyber.csv !datasets/get_test_data.sh diff --git a/ci/build_python.sh b/ci/build_python.sh index 11b99cd..e3a2c02 100755 --- a/ci/build_python.sh +++ b/ci/build_python.sh @@ -32,13 +32,11 @@ sccache --show-adv-stats RAPIDS_PACKAGE_VERSION=$(head -1 ./VERSION) rapids-conda-retry mambabuild \ --no-test \ --channel "${CPP_CHANNEL}" \ - --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \ conda/recipes/cugraph-pyg RAPIDS_PACKAGE_VERSION=$(head -1 ./VERSION) rapids-conda-retry mambabuild \ --no-test \ --channel "${CPP_CHANNEL}" \ - --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \ conda/recipes/cugraph-dgl rapids-upload-conda-to-s3 python diff --git a/ci/run_cugraph_pyg_pytests.sh b/ci/run_cugraph_pyg_pytests.sh index fb27f16..13fbca7 100755 --- a/ci/run_cugraph_pyg_pytests.sh +++ b/ci/run_cugraph_pyg_pytests.sh @@ -9,7 +9,7 @@ cd "$(dirname "$(realpath "${BASH_SOURCE[0]}")")"/../python/cugraph-pyg/cugraph_ pytest --cache-clear --benchmark-disable "$@" . # Used to skip certain examples in CI due to memory limitations -export CI_RUN=1 +export CI=true # Test examples for e in "$(pwd)"/examples/*.py; do diff --git a/ci/test_wheel_cugraph-pyg.sh b/ci/test_wheel_cugraph-pyg.sh index 34654c4..97b725c 100755 --- a/ci/test_wheel_cugraph-pyg.sh +++ b/ci/test_wheel_cugraph-pyg.sh @@ -32,9 +32,6 @@ python -m pip install \ # RAPIDS_DATASET_ROOT_DIR is used by test scripts export RAPIDS_DATASET_ROOT_DIR="$(realpath datasets)" -# Used to skip certain examples in CI due to memory limitations -export CI_RUN=1 - rapids-logger "pytest cugraph-pyg (single GPU)" pushd python/cugraph-pyg/cugraph_pyg python -m pytest \ diff --git a/python/cugraph-pyg/cugraph_pyg/examples/gcn_dist_mnmg.py b/python/cugraph-pyg/cugraph_pyg/examples/gcn_dist_mnmg.py index bb0252f..1e19aa7 100644 --- a/python/cugraph-pyg/cugraph_pyg/examples/gcn_dist_mnmg.py +++ b/python/cugraph-pyg/cugraph_pyg/examples/gcn_dist_mnmg.py @@ -348,7 +348,7 @@ def parse_args(): parser.add_argument("--batch_size", type=int, default=1024) parser.add_argument("--fan_out", type=int, default=30) parser.add_argument("--tempdir_root", type=str, default=None) - parser.add_argument("--dataset_root", type=str, default="dataset") + parser.add_argument("--dataset_root", type=str, default="datasets") parser.add_argument("--dataset", type=str, default="ogbn-products") parser.add_argument("--skip_partition", action="store_true") parser.add_argument("--wg_mem_type", type=str, default="distributed") diff --git a/python/cugraph-pyg/cugraph_pyg/examples/gcn_dist_sg.py b/python/cugraph-pyg/cugraph_pyg/examples/gcn_dist_sg.py index 0f9c39b..223b58f 100644 --- a/python/cugraph-pyg/cugraph_pyg/examples/gcn_dist_sg.py +++ b/python/cugraph-pyg/cugraph_pyg/examples/gcn_dist_sg.py @@ -156,7 +156,7 @@ def parse_args(): parser.add_argument("--batch_size", type=int, default=1024) parser.add_argument("--fan_out", type=int, default=30) parser.add_argument("--tempdir_root", type=str, default=None) - parser.add_argument("--dataset_root", type=str, default="dataset") + parser.add_argument("--dataset_root", type=str, default="datasets") parser.add_argument("--dataset", type=str, default="ogbn-products") parser.add_argument("--in_memory", action="store_true", default=False) parser.add_argument("--seeds_per_call", type=int, default=-1) @@ -173,7 +173,7 @@ def parse_args(): args.dataset, args.dataset_root ) - if "CI_RUN" in os.environ and os.environ["CI_RUN"] == "1": + if os.getenv("CI", "false").lower() == "true": warnings.warn("Pruning test dataset for CI run.") split_idx["test"] = split_idx["test"][:1000] diff --git a/python/cugraph-pyg/cugraph_pyg/examples/gcn_dist_snmg.py b/python/cugraph-pyg/cugraph_pyg/examples/gcn_dist_snmg.py index 56997db..42e3343 100644 --- a/python/cugraph-pyg/cugraph_pyg/examples/gcn_dist_snmg.py +++ b/python/cugraph-pyg/cugraph_pyg/examples/gcn_dist_snmg.py @@ -261,7 +261,7 @@ def run_train( if __name__ == "__main__": - if "CI_RUN" in os.environ and os.environ["CI_RUN"] == "1": + if os.getenv("CI", "false").lower() == "true": warnings.warn("Skipping SMNG example in CI due to memory limit") else: parser = argparse.ArgumentParser() @@ -272,7 +272,7 @@ def run_train( parser.add_argument("--batch_size", type=int, default=1024) parser.add_argument("--fan_out", type=int, default=30) parser.add_argument("--tempdir_root", type=str, default=None) - parser.add_argument("--dataset_root", type=str, default="dataset") + parser.add_argument("--dataset_root", type=str, default="datasets") parser.add_argument("--dataset", type=str, default="ogbn-products") parser.add_argument("--in_memory", action="store_true", default=False) parser.add_argument("--seeds_per_call", type=int, default=-1) diff --git a/python/cugraph-pyg/cugraph_pyg/examples/rgcn_link_class_mnmg.py b/python/cugraph-pyg/cugraph_pyg/examples/rgcn_link_class_mnmg.py index 3c54b8e..8566ad7 100644 --- a/python/cugraph-pyg/cugraph_pyg/examples/rgcn_link_class_mnmg.py +++ b/python/cugraph-pyg/cugraph_pyg/examples/rgcn_link_class_mnmg.py @@ -148,7 +148,7 @@ def parse_args(): parser.add_argument("--num_pos", type=int, default=-1) parser.add_argument("--fan_out", type=int, default=10) parser.add_argument("--dataset", type=str, default="ogbl-wikikg2") - parser.add_argument("--dataset_root", type=str, default="dataset") + parser.add_argument("--dataset_root", type=str, default="datasets") parser.add_argument("--seeds_per_call", type=int, default=-1) parser.add_argument("--n_devices", type=int, default=-1) parser.add_argument("--skip_partition", action="store_true") diff --git a/python/cugraph-pyg/cugraph_pyg/examples/rgcn_link_class_sg.py b/python/cugraph-pyg/cugraph_pyg/examples/rgcn_link_class_sg.py index 67d7eec..6823fe7 100644 --- a/python/cugraph-pyg/cugraph_pyg/examples/rgcn_link_class_sg.py +++ b/python/cugraph-pyg/cugraph_pyg/examples/rgcn_link_class_sg.py @@ -155,7 +155,7 @@ def parse_args(): parser.add_argument("--num_neg", type=int, default=500) parser.add_argument("--fan_out", type=int, default=10) parser.add_argument("--dataset", type=str, default="ogbl-wikikg2") - parser.add_argument("--dataset_root", type=str, default="dataset") + parser.add_argument("--dataset_root", type=str, default="datasets") parser.add_argument("--seeds_per_call", type=int, default=-1) return parser.parse_args() diff --git a/python/cugraph-pyg/cugraph_pyg/examples/rgcn_link_class_snmg.py b/python/cugraph-pyg/cugraph_pyg/examples/rgcn_link_class_snmg.py index ec7174c..131dfea 100644 --- a/python/cugraph-pyg/cugraph_pyg/examples/rgcn_link_class_snmg.py +++ b/python/cugraph-pyg/cugraph_pyg/examples/rgcn_link_class_snmg.py @@ -183,7 +183,7 @@ def parse_args(): parser.add_argument("--num_pos", type=int, default=-1) parser.add_argument("--fan_out", type=int, default=10) parser.add_argument("--dataset", type=str, default="ogbl-wikikg2") - parser.add_argument("--dataset_root", type=str, default="dataset") + parser.add_argument("--dataset_root", type=str, default="datasets") parser.add_argument("--seeds_per_call", type=int, default=-1) parser.add_argument("--n_devices", type=int, default=-1) @@ -273,7 +273,7 @@ def get_eval_loader(stage: str): if __name__ == "__main__": - if "CI_RUN" in os.environ and os.environ["CI_RUN"] == "1": + if os.getenv("CI", "false").lower() == "true": warnings.warn("Skipping SMNG example in CI due to memory limit") else: args = parse_args()