Skip to content

Commit

Permalink
remove unnecessary channel for builds, use CI instead of CI_RUN, cons…
Browse files Browse the repository at this point in the history
…olidate gitignore
  • Loading branch information
jameslamb committed Oct 29, 2024
1 parent a421fc9 commit 1202c36
Show file tree
Hide file tree
Showing 10 changed files with 10 additions and 16 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ cpp/thirdparty/googletest/
*.iws

## Datasets
dataset/
datasets/
!datasets/cyber.csv
!datasets/get_test_data.sh
Expand Down
2 changes: 0 additions & 2 deletions ci/build_python.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion ci/run_cugraph_pyg_pytests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions ci/test_wheel_cugraph-pyg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion python/cugraph-pyg/cugraph_pyg/examples/gcn_dist_mnmg.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions python/cugraph-pyg/cugraph_pyg/examples/gcn_dist_sg.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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]

Expand Down
4 changes: 2 additions & 2 deletions python/cugraph-pyg/cugraph_pyg/examples/gcn_dist_snmg.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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()
Expand Down

0 comments on commit 1202c36

Please sign in to comment.