Changing description for dynamicend tests.

Signed-off-by: Yasushi Negishi <[email protected]>

Author: negiyas

src/Builder/FrontendDialectTransformer.cpp

@@ -1389,10 +1389,8 @@ class FrontendGenImpl {
   }
 
   void getParamStr(std::string envStr, Value arg, std::string &paramStr) {
-      fprintf(stderr, "XXXX getParamStr called envStr=%s\n", envStr.c_str());fflush(stdout);
     if (envStr != "*") {
       std::replace(envStr.begin(), envStr.end(), '=', ':');
-      fprintf(stderr, "XXXX getParamStr return envStr=%s\n", envStr.c_str());fflush(stdout);
       paramStr = envStr;
       return;
     }
@@ -1414,19 +1412,16 @@ class FrontendGenImpl {
     paramStrStream << envInputString;
     std::string envStr;
     while (std::getline(paramStrStream, envStr, '|')) {
-      fprintf(stderr, "XXXX envStr=%s\n", envStr.c_str());
       size_t pos = envStr.find(':');
       assert((pos > 0) && "invalid IMPORTER_FORCE_DYNAMIC environment");
       int idx = stoi(envStr.substr(0, pos));
       envStr = envStr.substr(pos + 1);
       if (idx < 0) { // set all arguments
         for (size_t i = 0; i < numOfArgs; i++) {
           getParamStr(envStr, args[i], paramStrVec[i]);
-          fprintf(stderr, "XXXXA paramStrVec[%ld]=%s\n", i, paramStrVec[i].c_str());fflush(stderr);
         }
       } else {
         getParamStr(envStr, args[idx], paramStrVec[idx]);
-        fprintf(stderr, "XXXXB paramStrVec[%d]=%s\n", idx, paramStrVec[idx].c_str());fflush(stderr);
       }
     }
     return;

test/accelerators/NNPA/backend/CMakeLists.txt

@@ -363,7 +363,9 @@ set(NNPA_TESTS_ENVS TEST_MCPU=z16 TEST_MACCEL=NNPA TEST_CASE_BY_USER=${ENV_TEST_
 
 set(NNPA_TEST_LIST_DYNAMIC
     # ==OP== Add
-    test_add_cpu,zdnn_add,"{0:0=aa,1=bb,2=cc|1:0=aa,1=bb,2=cc}"
+    #test_add_cpu,zdnn_add,"0:0=aa,1=bb,2=cc|1:0=aa,1=bb,2=cc"
+    test_add_cpu,zdnn_add,"0:0=aa,1=bb,2=cc|1:0=aa,1=bb,2=cc"
+    #test_add_cpu,zdnn_add
 )
 set(NNPA_TEST_LIST_DYNAMIC_
     # ==OP== Add

test/backend/common.py

@@ -34,9 +34,9 @@ def determine_dynamic_parameters(test_name):
     selected_list = {args.input: {args.dim}}
     test_name_cpu = test_name + "_cpu"
     if test_name_cpu in variables.test_for_dynamic:
-        if len(test_to_enable_dynshape_dict[test_name_cpu]) > 1:
+        if test_name_cpu in test_to_enable_dynshape_dict:
             selected_list = variables.test_to_enable_dynshape_dict[test_name_cpu]
-        else if len(variables.test_to_enable_dict[test_name_cpu]) > 1:
+        elif len(variables.test_to_enable_dict[test_name_cpu]) > 1:
             selected_list = variables.test_to_enable_dict[test_name_cpu].get( 
                 DYNAMIC_SHAPE
             )
@@ -52,19 +52,22 @@ def execute_commands(cmds, dynamic_inputs_dims):
     env_string = ""
     if dynamic_inputs_dims is not None:
         first_input = True
-        for input_index, dim_indices in dynamic_inputs_dims.items():
-            if first_input:
-                env_string += str(input_index)
-                first_input = False
-            else:
-                env_string += "|" + str(input_index)
-            first_dim = True
-            for dim_index in dim_indices:
-                if first_dim:
-                    env_string += ":" + str(dim_index)
-                    first_dim = False
+        if isinstance(dynamic_inputs_dims, dict):
+            for input_index, dim_indices in dynamic_inputs_dims.items():
+                if first_input:
+                    env_string += str(input_index)
+                    first_input = False
                 else:
-                    env_string += "," + str(dim_index)
+                    env_string += "|" + str(input_index)
+                first_dim = True
+                for dim_index in dim_indices:
+                    if first_dim:
+                        env_string += ":" + str(dim_index)
+                        first_dim = False
+                    else:
+                        env_string += "," + str(dim_index)
+        else:
+            env_string = dynamic_inputs_dims
         my_env["IMPORTER_FORCE_DYNAMIC"] = env_string
     subprocess.run(cmds, env=my_env, check=True)
 

test/backend/inference_backend.py

@@ -110,7 +110,7 @@ def get_test_models():
         # ==LIM== No support for short integers.
         "test_add_cpu": {
             STATIC_SHAPE: {},
-            DYNAMIC_SHAPE: {-1: {0:"0=a,1=b,2=c", 1:"0=a,1=b,2=c"}},
+            DYNAMIC_SHAPE: {-1: {-1}},
             CONSTANT_INPUT: {-1},
         },
         "test_add_bcast_cpu": {