@@ -146,29 +146,29 @@ run_mpi_integration() {
146
146
if [[ ${test} != * " tf2_" * ]] && [[ ${test} != * " tfhead" * ]]; then
147
147
run_test " ${test} " " ${queue} " \
148
148
" :tensorflow: Test TensorFlow MNIST (${test} )" \
149
- " bash -c \" ${oneccl_env} \\\$ (cat /mpirun_command) python /horovod/examples/tensorflow_mnist.py\" "
149
+ " bash -c \" ${oneccl_env} \\\$ (cat /mpirun_command) python /horovod/examples/tensorflow/ tensorflow_mnist.py\" "
150
150
151
151
run_test " ${test} " " ${queue} " \
152
152
" :tensorflow: Test TensorFlow Eager MNIST (${test} )" \
153
- " bash -c \" ${oneccl_env} \\\$ (cat /mpirun_command) python /horovod/examples/tensorflow_mnist_eager.py\" "
153
+ " bash -c \" ${oneccl_env} \\\$ (cat /mpirun_command) python /horovod/examples/tensorflow/ tensorflow_mnist_eager.py\" "
154
154
155
155
run_test " ${test} " " ${queue} " \
156
156
" :tensorflow: Test Keras MNIST (${test} )" \
157
- " bash -c \" ${oneccl_env} \\\$ (cat /mpirun_command) python /horovod/examples/keras_mnist_advanced.py\" "
157
+ " bash -c \" ${oneccl_env} \\\$ (cat /mpirun_command) python /horovod/examples/keras/ keras_mnist_advanced.py\" "
158
158
159
159
run_test " ${test} " " ${queue} " \
160
160
" :fire: Test PyTorch MNIST (${test} )" \
161
- " bash -c \" ${oneccl_env} \\\$ (cat /mpirun_command) python /horovod/examples/pytorch_mnist.py\" "
161
+ " bash -c \" ${oneccl_env} \\\$ (cat /mpirun_command) python /horovod/examples/pytorch/ pytorch_mnist.py\" "
162
162
fi
163
163
164
164
if [[ ${test} == * " mxnet2_" * ]] || [[ ${test} == * " mxnethead" * ]]; then
165
165
run_test " ${test} " " ${queue} " \
166
166
" :muscle: Test MXNet2 MNIST (${test} )" \
167
- " bash -c \" ${oneccl_env} OMP_NUM_THREADS=1 \\\$ (cat /mpirun_command) python /horovod/examples/mxnet2_mnist.py\" "
167
+ " bash -c \" ${oneccl_env} OMP_NUM_THREADS=1 \\\$ (cat /mpirun_command) python /horovod/examples/mxnet/ mxnet2_mnist.py\" "
168
168
else
169
169
run_test " ${test} " " ${queue} " \
170
170
" :muscle: Test MXNet MNIST (${test} )" \
171
- " bash -c \" ${oneccl_env} OMP_NUM_THREADS=1 \\\$ (cat /mpirun_command) python /horovod/examples/mxnet_mnist.py\" "
171
+ " bash -c \" ${oneccl_env} OMP_NUM_THREADS=1 \\\$ (cat /mpirun_command) python /horovod/examples/mxnet/ mxnet_mnist.py\" "
172
172
fi
173
173
174
174
# tests that should be executed only with the latest release since they don't test
@@ -181,22 +181,22 @@ run_mpi_integration() {
181
181
if [[ ${test} == * " openmpi" * ]]; then
182
182
run_test " ${test} " " ${queue} " \
183
183
" :terminal: Test Horovodrun (${test} )" \
184
- " horovodrun -np 2 -H localhost:2 python /horovod/examples/tensorflow_mnist.py"
184
+ " horovodrun -np 2 -H localhost:2 python /horovod/examples/tensorflow/ tensorflow_mnist.py"
185
185
run_test " ${test} " " ${queue} " \
186
186
" :terminal: Test Horovodrun (${test} )" \
187
- " bash -c \" echo 'localhost slots=2' > hostfile && horovodrun -np 2 -hostfile hostfile python /horovod/examples/mxnet_mnist.py\" "
187
+ " bash -c \" echo 'localhost slots=2' > hostfile && horovodrun -np 2 -hostfile hostfile python /horovod/examples/mxnet/ mxnet_mnist.py\" "
188
188
fi
189
189
fi
190
190
191
191
# TensorFlow 2.0 tests
192
192
if [[ ${test} == * " tf2_" * ]] || [[ ${test} == * " tfhead" * ]]; then
193
193
run_test " ${test} " " ${queue} " \
194
194
" :tensorflow: Test TensorFlow 2.0 MNIST (${test} )" \
195
- " bash -c \"\\\$ (cat /mpirun_command) python /horovod/examples/tensorflow2_mnist.py\" "
195
+ " bash -c \"\\\$ (cat /mpirun_command) python /horovod/examples/tensorflow2/ tensorflow2_mnist.py\" "
196
196
197
197
run_test " ${test} " " ${queue} " \
198
198
" :tensorflow: Test TensorFlow 2.0 Keras MNIST (${test} )" \
199
- " bash -c \"\\\$ (cat /mpirun_command) python /horovod/examples/tensorflow2_keras_mnist.py\" "
199
+ " bash -c \"\\\$ (cat /mpirun_command) python /horovod/examples/tensorflow2/ tensorflow2_keras_mnist.py\" "
200
200
fi
201
201
}
202
202
@@ -250,33 +250,33 @@ run_gloo_integration() {
250
250
if [[ ${test} == * " tf2_" * ]] || [[ ${test} == * " tfhead" * ]]; then
251
251
run_test " ${test} " " ${queue} " \
252
252
" :tensorflow: Test TensorFlow 2.0 MNIST (${test} )" \
253
- " horovodrun -np 2 -H localhost:2 --gloo python /horovod/examples/tensorflow2_mnist.py"
253
+ " horovodrun -np 2 -H localhost:2 --gloo python /horovod/examples/tensorflow2/ tensorflow2_mnist.py"
254
254
255
255
run_test " ${test} " " ${queue} " \
256
256
" :tensorflow: Test TensorFlow 2.0 Keras MNIST (${test} )" \
257
- " horovodrun -np 2 -H localhost:2 --gloo python /horovod/examples/tensorflow2_keras_mnist.py"
257
+ " horovodrun -np 2 -H localhost:2 --gloo python /horovod/examples/tensorflow2/ tensorflow2_keras_mnist.py"
258
258
else
259
259
run_test " ${test} " " ${queue} " \
260
260
" :tensorflow: Test TensorFlow MNIST (${test} )" \
261
- " horovodrun -np 2 -H localhost:2 --gloo python /horovod/examples/tensorflow_mnist.py"
261
+ " horovodrun -np 2 -H localhost:2 --gloo python /horovod/examples/tensorflow/ tensorflow_mnist.py"
262
262
263
263
run_test " ${test} " " ${queue} " \
264
264
" :tensorflow: Test Keras MNIST (${test} )" \
265
- " horovodrun -np 2 -H localhost:2 --gloo python /horovod/examples/keras_mnist_advanced.py"
265
+ " horovodrun -np 2 -H localhost:2 --gloo python /horovod/examples/keras/ keras_mnist_advanced.py"
266
266
fi
267
267
268
268
run_test " ${test} " " ${queue} " \
269
269
" :fire: Test PyTorch MNIST (${test} )" \
270
- " horovodrun -np 2 -H localhost:2 --gloo python /horovod/examples/pytorch_mnist.py"
270
+ " horovodrun -np 2 -H localhost:2 --gloo python /horovod/examples/pytorch/ pytorch_mnist.py"
271
271
272
272
if [[ ${test} == * " mxnet2_" * ]] || [[ ${test} == * " mxnethead" * ]]; then
273
273
run_test " ${test} " " ${queue} " \
274
274
" :muscle: Test MXNet2 MNIST (${test} )" \
275
- " horovodrun -np 2 -H localhost:2 --gloo python /horovod/examples/mxnet2_mnist.py"
275
+ " horovodrun -np 2 -H localhost:2 --gloo python /horovod/examples/mxnet/ mxnet2_mnist.py"
276
276
else
277
277
run_test " ${test} " " ${queue} " \
278
278
" :muscle: Test MXNet MNIST (${test} )" \
279
- " horovodrun -np 2 -H localhost:2 --gloo python /horovod/examples/mxnet_mnist.py"
279
+ " horovodrun -np 2 -H localhost:2 --gloo python /horovod/examples/mxnet/ mxnet_mnist.py"
280
280
fi
281
281
282
282
# Elastic
@@ -320,15 +320,15 @@ run_spark_integration() {
320
320
if [[ ${test} != * " tf2" * && ${test} != * " tfhead" * ]]; then
321
321
run_test " ${test} " " ${queue} " \
322
322
" :spark: Spark Keras Rossmann Run (${test} )" \
323
- " bash -c \" OMP_NUM_THREADS=1 python /horovod/examples/keras_spark_rossmann_run.py --num-proc 2 --data-dir file:///data --epochs 3 --sample-rate 0.01\" "
323
+ " bash -c \" OMP_NUM_THREADS=1 python /horovod/examples/spark/keras/ keras_spark_rossmann_run.py --num-proc 2 --data-dir file:///data --epochs 3 --sample-rate 0.01\" "
324
324
325
325
run_test " ${test} " " ${queue} " \
326
326
" :spark: Spark Keras Rossmann Estimator (${test} )" \
327
- " bash -c \" OMP_NUM_THREADS=1 python /horovod/examples/keras_spark_rossmann_estimator.py --num-proc 2 --work-dir /work --data-dir file:///data --epochs 3 --sample-rate 0.01\" "
327
+ " bash -c \" OMP_NUM_THREADS=1 python /horovod/examples/spark/keras/ keras_spark_rossmann_estimator.py --num-proc 2 --work-dir /work --data-dir file:///data --epochs 3 --sample-rate 0.01\" "
328
328
329
329
run_test " ${test} " " ${queue} " \
330
330
" :spark: Spark Keras MNIST (${test} )" \
331
- " bash -c \" OMP_NUM_THREADS=1 python /horovod/examples/keras_spark_mnist.py --num-proc 2 --work-dir /work --data-dir /data --epochs 3\" "
331
+ " bash -c \" OMP_NUM_THREADS=1 python /horovod/examples/spark/keras/ keras_spark_mnist.py --num-proc 2 --work-dir /work --data-dir /data --epochs 3\" "
332
332
333
333
if [[ ${queue} != * gpu* ]]; then
334
334
run_test " ${test} " " ${queue} " \
@@ -339,7 +339,7 @@ run_spark_integration() {
339
339
340
340
run_test " ${test} " " ${queue} " \
341
341
" :spark: Spark Torch MNIST (${test} )" \
342
- " bash -c \" OMP_NUM_THREADS=1 python /horovod/examples/pytorch_spark_mnist.py --num-proc 2 --work-dir /work --data-dir /data --epochs 3\" "
342
+ " bash -c \" OMP_NUM_THREADS=1 python /horovod/examples/spark/pytorch/ pytorch_spark_mnist.py --num-proc 2 --work-dir /work --data-dir /data --epochs 3\" "
343
343
fi
344
344
}
345
345
@@ -353,21 +353,21 @@ run_single_integration() {
353
353
if [[ ${test} != * " tf2_" * ]] && [[ ${test} != * " tfhead" * ]]; then
354
354
run_test " ${test} " " ${queue} " \
355
355
" :tensorflow: Single Keras MNIST (${test} )" \
356
- " bash -c \" ${oneccl_env} python /horovod/examples/keras_mnist_advanced.py --epochs 3 --batch-size 64\" "
356
+ " bash -c \" ${oneccl_env} python /horovod/examples/keras/ keras_mnist_advanced.py --epochs 3 --batch-size 64\" "
357
357
fi
358
358
359
359
run_test " ${test} " " ${queue} " \
360
360
" :fire: Single PyTorch MNIST (${test} )" \
361
- " bash -c \" ${oneccl_env} python /horovod/examples/pytorch_mnist.py --epochs 3\" "
361
+ " bash -c \" ${oneccl_env} python /horovod/examples/pytorch/ pytorch_mnist.py --epochs 3\" "
362
362
363
363
if [[ ${test} == * " mxnet2_" * ]] || [[ ${test} == * " mxnethead" * ]]; then
364
364
run_test " ${test} " " ${queue} " \
365
365
" :muscle: Single MXNet2 MNIST (${test} )" \
366
- " bash -c \" ${oneccl_env} python /horovod/examples/mxnet2_mnist.py --epochs 3\" "
366
+ " bash -c \" ${oneccl_env} python /horovod/examples/mxnet/ mxnet2_mnist.py --epochs 3\" "
367
367
else
368
368
run_test " ${test} " " ${queue} " \
369
369
" :muscle: Single MXNet MNIST (${test} )" \
370
- " bash -c \" ${oneccl_env} python /horovod/examples/mxnet_mnist.py --epochs 3\" "
370
+ " bash -c \" ${oneccl_env} python /horovod/examples/mxnet/ mxnet_mnist.py --epochs 3\" "
371
371
fi
372
372
}
373
373
0 commit comments