simplified some test paths

LLNL · Sep 26, 2023 · d09d054 · d09d054
1 parent dfedbdb
commit d09d054
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/.github/workflows/develop-test.yml b/.github/workflows/develop-test.yml
@@ -115,7 +115,7 @@ jobs:
           python tests/backend/torch_correctness.py
           export MUYGPYS_BACKEND=torch
           export MUYGPYS_FTYPE=32
-          python tests/muygps_torch/muygps_torch.py
+          python tests/torch/muygps_torch.py
 
   build-docs:
     runs-on: ubuntu-latest

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -43,10 +43,10 @@ all_tests:
     - salloc -N1 -ppvis -A muygps --mpibind=on python tests/optimize.py
     - salloc -N1 -ppvis -A muygps --mpibind=on python tests/predict.py
     - salloc -N1 -ppvis -A muygps --mpibind=on python tests/multivariate.py
-    - salloc -N1 -ppvis -A muygps --mpibind=on python tests/jax_correctness.py
-    - salloc -N1 -ppvis -A muygps --mpibind=on python tests/regress_api.py /p/lustre1/madstare/muygps-data/
-    - salloc -N1 -ppvis -A muygps --mpibind=on python tests/classify_api.py /p/lustre1/madstare/muygps-data/
-    - salloc -N1 -ppvis -A muygps --mpibind=on python tests/fast_regress_api.py /p/lustre1/madstare/muygps-data/
+    - salloc -N1 -ppvis -A muygps --mpibind=on python tests/backend/jax_correctness.py
+    - salloc -N1 -ppvis -A muygps --mpibind=on python tests/api/regress.py /p/lustre1/madstare/muygps-data/
+    - salloc -N1 -ppvis -A muygps --mpibind=on python tests/api/classify.py /p/lustre1/madstare/muygps-data/
+    - salloc -N1 -ppvis -A muygps --mpibind=on python tests/precompute/fast_regress_api.py /p/lustre1/madstare/muygps-data/
     - echo "done with JAX tests"
     - export MUYGPYS_BACKEND=mpi
     - echo "performing MPI tests"
@@ -55,13 +55,12 @@ all_tests:
     - salloc -N1 --tasks-per-node=36 -ppvis -A muygps --mpibind=on python tests/optimize.py
     - salloc -N1 --tasks-per-node=36 -ppvis -A muygps --mpibind=on python tests/predict.py
     - salloc -N1 --tasks-per-node=36 -ppvis -A muygps --mpibind=on python tests/multivariate.py
-    - salloc -N1 --tasks-per-node=36 -ppvis -A muygps --mpibind=on python tests/jax_correctness.py
-    - salloc -N1 --tasks-per-node=36 -ppvis -A muygps --mpibind=on python tests/regress_api.py /p/lustre1/madstare/muygps-data/
-    - salloc -N1 --tasks-per-node=36 -ppvis -A muygps --mpibind=on python tests/classify_api.py /p/lustre1/madstare/muygps-data/
-    - salloc -N1 --tasks-per-node=36 -ppvis -A muygps --mpibind=on python tests/fast_regress_api.py /p/lustre1/madstare/muygps-data/
+    - salloc -N1 --tasks-per-node=36 -ppvis -A muygps --mpibind=on python tests/backend/mpi_correctness.py
+    - salloc -N1 --tasks-per-node=36 -ppvis -A muygps --mpibind=on python tests/api/regress.py /p/lustre1/madstare/muygps-data/
+    - salloc -N1 --tasks-per-node=36 -ppvis -A muygps --mpibind=on python tests/api/classify.py /p/lustre1/madstare/muygps-data/
     - echo "done with MPI tests"
     - export MUYGPYS_BACKEND=torch
     - echo "performing Torch tests"
-    - salloc -N1 --tasks-per-node=36 -ppvis -A muygps --mpibind=on python tests/torch_correctness.py
-    - salloc -N1 --tasks-per-node=36 -ppvis -A muygps --mpibind=on python tests/torch_api.py /p/lustre1/madstare/muygps-data/
+    - salloc -N1 --tasks-per-node=36 -ppvis -A muygps --mpibind=on python tests/backend/torch_correctness.py
+    - salloc -N1 --tasks-per-node=36 -ppvis -A muygps --mpibind=on python tests/torch/torch_api.py /p/lustre1/madstare/muygps-data/
     - echo "done with Torch tests"
diff --git a/tests/muygps_torch/README.md → tests/torch/README.md b/tests/muygps_torch/README.md → tests/torch/README.md
diff --git a/tests/muygps_torch/muygps_torch.py → tests/torch/muygps_torch.py b/tests/muygps_torch/muygps_torch.py → tests/torch/muygps_torch.py
diff --git a/tests/muygps_torch/torch_api.py → tests/torch/torch_api.py b/tests/muygps_torch/torch_api.py → tests/torch/torch_api.py