未验证 提交 4ff0625e 编写于 作者: S Shenghang Tsai 提交者: GitHub

rm support for legacy code (#3243)

* rm support for legacy code

* rm user op in task name and script name
Co-authored-by: Ntsai <caishenghang@oneflow.org>
上级 839333bc
......@@ -78,21 +78,18 @@ jobs:
docker run --shm-size=8g --rm \
-w $PWD -v $PWD:$PWD -v /dataset:/dataset -v /model_zoo:/model_zoo \
oneflow-test bash ci/test/exe_test.sh
- name: Unit test with/without user op
- name: Unit test
run: |
docker run --shm-size=8g --rm \
-w $PWD -v $PWD:$PWD -v /dataset:/dataset -v /model_zoo:/model_zoo \
oneflow-test bash -c "bash ci/test/try_install.sh && bash ci/test/parallel_1node_op_test.sh"
oneflow-test bash -c "bash ci/test/try_install.sh && bash ci/test/1node_op_test.sh"
- name: Integration test
run: |
docker run --shm-size=8g --rm -w $PWD -v $PWD:$PWD -v /dataset:/dataset -v /model_zoo:/model_zoo --env ENABLE_USER_OP=False oneflow-test bash ci/test/1node_model_test.sh
- name: Integration test with user op
run: |
docker run --shm-size=8g --rm -w $PWD -v $PWD:$PWD -v /dataset:/dataset -v /model_zoo:/model_zoo --env ENABLE_USER_OP=True oneflow-test bash ci/test/1node_model_test.sh
- name: Benchmark with user op
docker run --shm-size=8g --rm -w $PWD -v $PWD:$PWD -v /dataset:/dataset -v /model_zoo:/model_zoo oneflow-test bash ci/test/1node_model_test.sh
- name: Benchmark
run: |
docker run --shm-size=8g --rm -w $PWD -v $PWD:$PWD -v /dataset:/dataset -v /model_zoo:/model_zoo oneflow-test bash ci/test/1node_benchmark_test.sh
- name: Benchmark with user op FP16
- name: Benchmark FP16
run: |
docker run --shm-size=8g --rm -w $PWD -v $PWD:$PWD -v /dataset:/dataset -v /model_zoo:/model_zoo oneflow-test bash ci/test/1node_benchmark_test_fp16.sh
- name: Build documentation
......
......@@ -3,7 +3,6 @@ set -xe
src_dir=${ONEFLOW_SRC_DIR:-"$PWD"}
test_tmp_dir=${ONEFLOW_TEST_TMP_DIR:-"/test_tmp_dir"}
test_tmp_dir="$test_tmp_dir/ENABLE_USER_OP_$ENABLE_USER_OP"
rm -rf $test_tmp_dir
......
set -xeu
pids=()
src_dir=${ONEFLOW_SRC_DIR:-"$PWD"}
ENABLE_USER_OP=True bash $src_dir/ci/test/1node_op_test.sh &
pids+=($!)
ENABLE_USER_OP=False bash $src_dir/ci/test/1node_op_test.sh &
pids+=($!)
for pid in "${pids[@]}"; do
wait "$pid"
done
......@@ -37,17 +37,6 @@ logged_op_confs = set({})
def CurJobAddOp(op_conf, scope_symbol=None):
# TODO: tsai: remove this debug code when transition ends
import os
if (
os.getenv("ENABLE_USER_OP") != "False"
and op_conf.HasField("user_conf") == False
):
op_type = op_conf.WhichOneof("op_type")
if op_type not in logged_op_confs and op_type != "return_conf":
print("non-user op added: {}".format(op_type))
logged_op_confs.add(op_type)
if distribute_ctx.IsMirroredStrategyEnabled():
return CurJobAddMirroredOp(op_conf, scope_symbol)
return CurJobAddConsistentOp(op_conf, scope_symbol)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册