Merge branch 'incubator-master' into sync_d9c74e0a

graphengine

@@ -1 +1 @@
-Subproject commit 579dcb75a990b533f9182733a6424f2bd66f0f23
+Subproject commit c27e428e9698dd4f9b198008596676bc2d1b49aa

mindspore/ccsrc/CMakeLists.txt

@@ -126,7 +126,7 @@ endif()
 
 if (ENABLE_GE)
     if(ENABLE_TRAIN)
-        target_link_libraries(mindspore ge_client_train hccl)
+        target_link_libraries(mindspore ge_runner hccl)
     else ()
         target_link_libraries(mindspore ge_client)
     endif ()

mindspore/ccsrc/transform/op_declare.cc

@@ -823,7 +823,7 @@ OUTPUT_MAP(RealDiv) = {{0, OUTPUT_DESC(y)}};
 // Cast
 INPUT_MAP(Cast) = {{1, INPUT_DESC(x)}};
 INPUT_ATTR_MAP(Cast) = {{2, ATTR_DESC(dst_type, AnyTraits<GEType>())}};
-ATTR_MAP(Cast) = {{"Truncate", ATTR_DESC(truncate, AnyTraits<bool>())}};
+ATTR_MAP(Cast) = EMPTY_ATTR_MAP;
 OUTPUT_MAP(Cast) = {{0, OUTPUT_DESC(y)}};
 
 // Reciprocal

mindspore/nn/optim/optimizer.py

@@ -279,7 +279,6 @@ class Optimizer(Cell):
                     current_dynamic_lr = self.gather(self.learning_rate[i], self.global_step, 0)
                     lr += (current_dynamic_lr,)
                 F.control_depend(lr, self.assignadd(self.global_step, 1))
-
         else:
             lr = self.learning_rate
             if self.dynamic_lr:

tests/ut/cpp/CMakeLists.txt

@@ -128,7 +128,7 @@ add_executable(ut_tests ${UT_SRCS} ${MINDSPORE_SRC_LIST} ${UT_SUTB_SRC_LIST})
 
 if (ENABLE_GE)
     if(ENABLE_TRAIN)
-        target_link_libraries(ut_tests PRIVATE graph ge_client_train)
+        target_link_libraries(ut_tests PRIVATE graph ge_runner)
     else()
         target_link_libraries(ut_tests PRIVATE graph ge_client)
     endif()

tests/ut/python/optimizer/test_optimize_with_parameter_groups.py

@@ -29,7 +29,6 @@ context.set_context(mode=context.GRAPH_MODE)
 
 class LeNet5(nn.Cell):
     """ LeNet5 definition """
-
     def __init__(self):
         super(LeNet5, self).__init__()
         self.conv1 = nn.Conv2d(1, 6, 5, pad_mode='valid')