Merge branch 'master' into support_input_check

dev-requirements.txt

@@ -1,6 +1,6 @@
 black==19.10b0; python_version >= "3.6"
 click==8.0.0; python_version >= "3.6" # https://github.com/psf/black/issues/2964
-numpy>=1.21.6
+numpy>=1.21.6, <2.0
 protobuf>=3.9.2, <4.0
 wheel
 tqdm
@@ -16,3 +16,4 @@ pytest-xdist
 pytest-repeat
 rich
 portalocker
+typing-extensions>=4.0.0, <5.0

oneflow/core/job_rewriter/cudnn_fused_normalization_add_relu_pass.cpp

@@ -84,7 +84,11 @@ Maybe<void> CudnnFusedNormalizationAddReluPass::Apply(Job* job, JobPassCtx* ctx)
     OperatorConf new_op_conf = op_conf;
     auto mute_attrs = new_op_conf.mutable_user_conf()->mutable_attr();
     auto training_it = mute_attrs->find("training");
-    if (training_it != mute_attrs->end()) { mute_attrs->erase(training_it); }
+    if (training_it != mute_attrs->end()) {
+      const bool training = user_op_conf.attr<bool>("training");
+      if (!training) { return; }
+      mute_attrs->erase(training_it);
+    }
     new_op_conf.mutable_user_conf()->set_op_type_name("cudnn_fused_" + op_type_name);
     job_builder.MutOpsOnlyOnce({new_op_conf});
   });

python/oneflow/mock_torch/mock_utils.py

@@ -19,7 +19,7 @@
 from collections import deque
 from importlib import import_module
 
-if sys.version_info < (3, 8):
+if sys.version_info <= (3, 8):
     try:
         from importlib_metadata import requires
     except ImportError:

python/setup.py

@@ -53,8 +53,9 @@ def get_version():
 
 
 REQUIRED_PACKAGES = [
-    f"numpy>={np.__version__}",
+    f"numpy>={np.__version__}, <2.0",
     "protobuf>=3.9.2, <4.0",
+    "typing-extensions>=4.0.0, <5.0",
     "tqdm",
     "requests",
     "pillow",