From 61dfc6a52931522c3d0656ec939fa73a76a97cfd Mon Sep 17 00:00:00 2001 From: "Lv, Liang1" Date: Wed, 7 Dec 2022 14:41:28 +0800 Subject: [PATCH 1/3] Enhance ITEX benchmark UT check Signed-off-by: Lv, Liang1 --- test/itex/test_tensorflow_itex_basic.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/itex/test_tensorflow_itex_basic.py b/test/itex/test_tensorflow_itex_basic.py index 9d3cb1e58ef..9b345e7f20b 100644 --- a/test/itex/test_tensorflow_itex_basic.py +++ b/test/itex/test_tensorflow_itex_basic.py @@ -258,8 +258,11 @@ def test_itex_benchmark_gpu(self): evaluator('performance') found_multi_instance_log = False + num_of_instance = int(os.environ.get('NUM_OF_INSTANCE')) + cores_per_instance = int(os.environ.get('CORES_PER_INSTANCE')) + log_file = '{}_{}_{}.log'.format(num_of_instance, cores_per_instance, 0) for file_name in os.listdir(os.getcwd()): - if file_name.endswith(".log"): + if file_name == log_file: found_multi_instance_log = True break From e0da254141a36432fbd48890c532517ba677ae46 Mon Sep 17 00:00:00 2001 From: "Lv, Liang1" Date: Wed, 7 Dec 2022 22:42:19 +0800 Subject: [PATCH 2/3] remove dependency on the environment variable Signed-off-by: Lv, Liang1 --- test/itex/test_tensorflow_itex_basic.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/test/itex/test_tensorflow_itex_basic.py b/test/itex/test_tensorflow_itex_basic.py index 9b345e7f20b..b6133c3118f 100644 --- a/test/itex/test_tensorflow_itex_basic.py +++ b/test/itex/test_tensorflow_itex_basic.py @@ -73,6 +73,12 @@ def setUpClass(self): accuracy: metric: topk: 1 + performance: + warmup: 10 + iteration: 100 + configs: + cores_per_instance: 4 + num_of_instance: 7 tuning: strategy: name: basic @@ -238,6 +244,8 @@ def test_itex_benchmark_gpu(self): relu = tf.nn.relu(add) relu6 = tf.nn.relu6(relu, name='op_to_store') out_name = relu6.name.split(':')[0] + num_of_instance = 1 + cores_per_instance = 1 with tf.compat.v1.Session() as sess: sess.run(tf.compat.v1.global_variables_initializer()) output_graph_def = graph_util.convert_variables_to_constants( @@ -254,12 +262,12 @@ def test_itex_benchmark_gpu(self): evaluator = Benchmark('fake_yaml_2.yaml') evaluator.b_dataloader = common.DataLoader(dataset) + num_of_instance = evaluator.conf.usr_cfg.evaluation.performance.configs.num_of_instance + cores_per_instance = evaluator.conf.usr_cfg.evaluation.performance.configs.cores_per_instance evaluator.model = output_graph evaluator('performance') found_multi_instance_log = False - num_of_instance = int(os.environ.get('NUM_OF_INSTANCE')) - cores_per_instance = int(os.environ.get('CORES_PER_INSTANCE')) log_file = '{}_{}_{}.log'.format(num_of_instance, cores_per_instance, 0) for file_name in os.listdir(os.getcwd()): if file_name == log_file: From 42874dbab7b1fd5cf2320511ab66882d1218ba75 Mon Sep 17 00:00:00 2001 From: "Lv, Liang1" Date: Thu, 8 Dec 2022 17:48:51 +0800 Subject: [PATCH 3/3] fix assert error for cpu_counts Signed-off-by: Lv, Liang1 --- test/itex/test_tensorflow_itex_basic.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/itex/test_tensorflow_itex_basic.py b/test/itex/test_tensorflow_itex_basic.py index b6133c3118f..4332cc362f4 100644 --- a/test/itex/test_tensorflow_itex_basic.py +++ b/test/itex/test_tensorflow_itex_basic.py @@ -77,8 +77,8 @@ def setUpClass(self): warmup: 10 iteration: 100 configs: - cores_per_instance: 4 - num_of_instance: 7 + cores_per_instance: 1 + num_of_instance: 1 tuning: strategy: name: basic