atune: profiles support multiple include values

analysis/atuned/collector.py

@@ -61,6 +61,7 @@ class Collector(Resource):
         current_app.logger.info(monitors)
 
         data = []
+        data_field = []
         for _ in range(collect_num):
             raw_data = MPI.get_monitors_data(monitors, mpis)
             current_app.logger.info(raw_data)
@@ -73,12 +74,13 @@ class Collector(Resource):
             if n_pipe is not None:
                 n_pipe.write(" ".join(str_data) + "\n")
 
+            data_field.append(float_data.copy())
             if data_type != "":
                 for type_name in data_type.split(":"):
                     float_data.append(type_name)
             data.append(float_data)
 
-        data_average = [sum(elem)/len(elem) for elem in zip(*data)]
+        data_average = [sum(elem)/len(elem) for elem in zip(*data_field)]
         data_result = {}
         for index, _ in enumerate(data_average):
             data_result[field_name[index]] = data_average[index]

analysis/engine/optimizer.py

@@ -22,7 +22,7 @@ from flask_restful import reqparse, Resource
 
 from analysis.engine.parser import OPTIMIZER_POST_PARSER, OPTIMIZER_PUT_PARSER
 from analysis.engine.utils import task_cache
-from optimizer import optimizer
+from analysis.optimizer import optimizer
 
 LOGGER = logging.getLogger(__name__)
 

analysis/optimizer/optimizer.py

@@ -162,7 +162,7 @@ class Optimizer(multiprocessing.Process):
             return None
         except Exception as e:
             LOGGER.error('Unexpected Error: %s', repr(e))
-            self.child_conn.send(Exception("Unexpected Error:", repr(e))
+            self.child_conn.send(Exception("Unexpected Error:", repr(e)))
             return None
 
         for i, knob in enumerate(self.knobs):

common/profile/loader.go

@@ -64,7 +64,9 @@ func loadProfile(profileNames []string, profiles []Profile,
 			if profile.options.HasKey("include") {
 				include, _ := profile.options.GetKey("include")
 				names := make([]string, 0)
-				names = append(names, strings.Trim(include.Value(), ""))
+				for _, includeValue := range strings.Split(include.Value(), ",") {
+					names = append(names, includeValue)
+				}
 				profiles, processedProfiles = loadProfile(names, profiles, processedProfiles, true)
 			}
 		}