'flux mini' -> 'flux' (#2445)

LLNL · May 6, 2024 · eb84553 · eb84553
1 parent 3dd7b01
commit eb84553
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/.gitlab/corona/pipeline.yml b/.gitlab/corona/pipeline.yml
@@ -71,14 +71,14 @@ build and install:
     - "export JOB_ID=$(flux jobs -no {id}:{name} | grep ${JOB_NAME} | awk -F: '{print $1}')"
     - "export LBANN_NNODES=$(flux jobs -no {id}:{name}:{nnodes} | grep ${JOB_NAME} | awk -F: '{print $3}')"
     - !reference [.setup_spack, script]
-    - flux proxy ${JOB_ID} flux mini run -N 1 -t 30m ./scripts/build_lbann.sh --ci ${SPACK_DEPS_FLAG}
+    - flux proxy ${JOB_ID} flux run -N 1 -t 30m ./scripts/build_lbann.sh --ci ${SPACK_DEPS_FLAG}
       -l ${SPACK_ENV_NAME} -j ${BUILD_TASKS} ${CLEAN_BUILD_FLAG}
       --ci-pip --
       +deterministic +vision +numpy +unit_tests ${SPACK_SPECS}
     - export TEST_TASKS_PER_NODE=4
     - export TEST_MPIBIND_FLAG="--mpibind=off"
-    - export SPACK_ARCH=$(flux proxy ${JOB_ID} flux mini run -N 1 spack arch)
-    - export SPACK_ARCH_TARGET=$(flux proxy ${JOB_ID} flux mini run -N 1 spack arch -t)
+    - export SPACK_ARCH=$(flux proxy ${JOB_ID} flux run -N 1 spack arch)
+    - export SPACK_ARCH_TARGET=$(flux proxy ${JOB_ID} flux run -N 1 spack arch -t)
     - export EXTRA_FLUX_ARGS="-o pmi=pmix"
     - !reference [.setup_lbann, script]
     - flux proxy ${JOB_ID} .gitlab/common/run-catch-tests-flux.sh

diff --git a/ci_test/common_python/test_tools.py b/ci_test/common_python/test_tools.py
@@ -36,7 +36,7 @@ def test_command_catalyst():
 
 def test_command_corona():
     actual = tools.get_command(cluster='corona', **d)
-    expected = 'flux mini alloc --nodes=20 --partition=pdebug --time=30 srun --mpibind=off --time=30 --ntasks=40 exe --reader=dir/model_zoo/data_readers/data_reader_mnist.prototext --data_reader_fraction=0.100000 --exit_after_setup --mini_batch_size=15 --model=dir/model_zoo/models/folder/model_lenet.prototext --num_epochs=7 --optimizer=dir/model_zoo/optimizers/opt_adagrad.prototext --procs_per_model=10 --print_affinity > output_file 2> error_file'
+    expected = 'flux alloc --nodes=20 --partition=pdebug --time=30 srun --mpibind=off --time=30 --ntasks=40 exe --reader=dir/model_zoo/data_readers/data_reader_mnist.prototext --data_reader_fraction=0.100000 --exit_after_setup --mini_batch_size=15 --model=dir/model_zoo/models/folder/model_lenet.prototext --num_epochs=7 --optimizer=dir/model_zoo/optimizers/opt_adagrad.prototext --procs_per_model=10 --print_affinity > output_file 2> error_file'
     assert actual == expected
 
 

diff --git a/ci_test/common_python/tools.py b/ci_test/common_python/tools.py
@@ -288,7 +288,7 @@ def get_command(cluster,
         # Allocate nodes only if we don't already have an allocation.
         if os.getenv('FLUX_JOB_ID') is None and flux_depth == 0:
             print('Allocating flux nodes.')
-            command_allocate = 'flux mini alloc'
+            command_allocate = 'flux alloc'
             option_num_nodes = ''
             option_partition = ''
             option_time_limit = ''
@@ -318,7 +318,7 @@ def get_command(cluster,
             space = ''
         else:
             space = ' '
-        command_run = '{s}flux mini run --time={t}'.format(
+        command_run = '{s}flux run --time={t}'.format(
             s=space, t=time_limit)
         option_num_nodes = ''
         if num_nodes is not None:

diff --git a/ci_test/unit_tests/test_catch2_unit_tests.py b/ci_test/unit_tests/test_catch2_unit_tests.py
@@ -21,7 +21,7 @@ def get_system_seq_launch(cluster):
     if cluster in ['lassen', 'ray']:
         return ['lrun', '-1', '--smpiargs=\"-disable_gpu_hooks\"']
     elif cluster in ['tioga', 'corona']:
-        return ['flux mini run', '-N1', '-n1']
+        return ['flux run', '-N1', '-n1']
     return ['srun', '-N1', '-n1', '--mpibind=off']
 
 def get_system_mpi_launch(cluster):
@@ -30,7 +30,7 @@ def get_system_mpi_launch(cluster):
     elif cluster == 'pascal':
         return ['srun', '-N2', '--ntasks-per-node=2', '--mpibind=off']
     elif cluster in ['tioga', 'corona']:
-        return ['flux mini run', '-N2', '-n2', '-g1', '-o gpu-affinity=per-task', '-o cpu-affinity=per-task']
+        return ['flux run', '-N2', '-n2', '-g1', '-o gpu-affinity=per-task', '-o cpu-affinity=per-task']
     else: # Catalyst
         return ['srun', '-N2', '--ntasks-per-node=4']