From 100d018c815b54c1d4ebf3595739f317ea1d0b8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=86=E6=96=87=E9=9C=9E?= <10511946+lu-wenxia@user.noreply.gitee.com> Date: Fri, 22 Apr 2022 07:04:19 +0000 Subject: [PATCH 01/32] update ID2115_for_TensorFlow/gan.py. --- TensorFlow/contrib/cv/ADAGAN_ID2115_for_TensorFlow/gan.py | 1 + 1 file changed, 1 insertion(+) diff --git a/TensorFlow/contrib/cv/ADAGAN_ID2115_for_TensorFlow/gan.py b/TensorFlow/contrib/cv/ADAGAN_ID2115_for_TensorFlow/gan.py index 7c302bfcc..394531c8c 100644 --- a/TensorFlow/contrib/cv/ADAGAN_ID2115_for_TensorFlow/gan.py +++ b/TensorFlow/contrib/cv/ADAGAN_ID2115_for_TensorFlow/gan.py @@ -58,6 +58,7 @@ class Gan(object): custom_op = config.graph_options.rewrite_options.custom_optimizers.add() custom_op.name = "NpuOptimizer" custom_op.parameter_map["dynamic_input"].b = True + custom_op.parameter_map["precision_mode"].s = tf.compat.as_bytes("allow_mix_precision") custom_op.parameter_map["dynamic_graph_execute_mode"].s = tf.compat.as_bytes("lazy_recompile") config.graph_options.rewrite_options.remapping = RewriterConfig.OFF # 必须显式关闭remap run_config = NPURunConfig(enable_data_pre_proc=False) -- Gitee From 563526cc62b39de61e3fc461f687770157d16375 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=86=E6=96=87=E9=9C=9E?= <10511946+lu-wenxia@user.noreply.gitee.com> Date: Fri, 22 Apr 2022 07:34:29 +0000 Subject: [PATCH 02/32] update ID2123_for_TensorFlow/train.py. --- .../contrib/cv/DDCGAN_ID2123_for_TensorFlow/train.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/TensorFlow/contrib/cv/DDCGAN_ID2123_for_TensorFlow/train.py b/TensorFlow/contrib/cv/DDCGAN_ID2123_for_TensorFlow/train.py index 10cf8dd31..b8912f627 100644 --- a/TensorFlow/contrib/cv/DDCGAN_ID2123_for_TensorFlow/train.py +++ b/TensorFlow/contrib/cv/DDCGAN_ID2123_for_TensorFlow/train.py @@ -79,7 +79,12 @@ def train(source_imgs, save_path, EPOCHES_set, BATCH_SIZE, logging_period=1, n_b logs.write('Train set has been trimmed %d samples...\n' % mod) # 将字符串写入文 source_imgs = source_imgs[:-mod] - + custom_op = config.graph_options.rewrite_options.custom_optimizers.add() + custom_op.name = "NpuOptimizer" + custom_op.parameter_map["use_off_line"].b = True + custom_op.parameter_map["precision_mode"].s = tf.compat.as_bytes("allow_mix_precision") + config.graph_options.rewrite_options.remapping = RewriterConfig.OFF + config.graph_options.rewrite_options.memory_optimization = RewriterConfig.OFF # create the graph with tf.Graph().as_default(), tf.Session(config=npu_config_proto()) as sess: SOURCE_VIS = tf.placeholder(tf.float32, shape = (BATCH_SIZE, patch_size, patch_size, 1), name = 'SOURCE_VIS') -- Gitee From f3457ddd6ac6f2c17add65071527a62fda1f1bdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=86=E6=96=87=E9=9C=9E?= <10511946+lu-wenxia@user.noreply.gitee.com> Date: Mon, 25 Apr 2022 07:40:11 +0000 Subject: [PATCH 03/32] update --- .../COMPARE_GAN_ID2103_for_TensorFlow/compare_gan/main.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/TensorFlow/contrib/cv/comparegan/COMPARE_GAN_ID2103_for_TensorFlow/compare_gan/main.py b/TensorFlow/contrib/cv/comparegan/COMPARE_GAN_ID2103_for_TensorFlow/compare_gan/main.py index 14d4de687..659e88c94 100644 --- a/TensorFlow/contrib/cv/comparegan/COMPARE_GAN_ID2103_for_TensorFlow/compare_gan/main.py +++ b/TensorFlow/contrib/cv/comparegan/COMPARE_GAN_ID2103_for_TensorFlow/compare_gan/main.py @@ -106,7 +106,9 @@ def _get_run_config(tf_random_seed=None, tf_random_seed=tf_random_seed, save_checkpoints_steps=save_checkpoints_steps, keep_checkpoint_max=keep_checkpoint_max, - session_config=config) + session_config=config, + precision_mode="allow_mix_precision", + modify_mixlist="./ops_info.json") -- Gitee From be162e0f969d79d6699064de6fdf061788786c5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=86=E6=96=87=E9=9C=9E?= <10511946+lu-wenxia@user.noreply.gitee.com> Date: Mon, 25 Apr 2022 07:42:28 +0000 Subject: [PATCH 04/32] add --- .../compare_gan/ops_info.json | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 TensorFlow/contrib/cv/comparegan/COMPARE_GAN_ID2103_for_TensorFlow/compare_gan/ops_info.json diff --git a/TensorFlow/contrib/cv/comparegan/COMPARE_GAN_ID2103_for_TensorFlow/compare_gan/ops_info.json b/TensorFlow/contrib/cv/comparegan/COMPARE_GAN_ID2103_for_TensorFlow/compare_gan/ops_info.json new file mode 100644 index 000000000..90e886471 --- /dev/null +++ b/TensorFlow/contrib/cv/comparegan/COMPARE_GAN_ID2103_for_TensorFlow/compare_gan/ops_info.json @@ -0,0 +1,5 @@ +{ + "black-list": { + "to-add": ["ReduceSumD"] + } +} \ No newline at end of file -- Gitee From ddfc1d67b899362eb64681fd019f04e9480958df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=86=E6=96=87=E9=9C=9E?= <10511946+lu-wenxia@user.noreply.gitee.com> Date: Tue, 26 Apr 2022 09:24:20 +0000 Subject: [PATCH 05/32] update --- TensorFlow/contrib/cv/DDCGAN_ID2123_for_TensorFlow/train.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/TensorFlow/contrib/cv/DDCGAN_ID2123_for_TensorFlow/train.py b/TensorFlow/contrib/cv/DDCGAN_ID2123_for_TensorFlow/train.py index b8912f627..f07329541 100644 --- a/TensorFlow/contrib/cv/DDCGAN_ID2123_for_TensorFlow/train.py +++ b/TensorFlow/contrib/cv/DDCGAN_ID2123_for_TensorFlow/train.py @@ -79,6 +79,9 @@ def train(source_imgs, save_path, EPOCHES_set, BATCH_SIZE, logging_period=1, n_b logs.write('Train set has been trimmed %d samples...\n' % mod) # 将字符串写入文 source_imgs = source_imgs[:-mod] + + config = tf.ConfigProto() + custom_op = config.graph_options.rewrite_options.custom_optimizers.add() custom_op.name = "NpuOptimizer" custom_op.parameter_map["use_off_line"].b = True -- Gitee From 6e57de10ba88267b2827cdbaed39e9b1bc1f45ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=86=E6=96=87=E9=9C=9E?= <10511946+lu-wenxia@user.noreply.gitee.com> Date: Tue, 26 Apr 2022 11:45:22 +0000 Subject: [PATCH 06/32] update --- .../efficientnet_model.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/TensorFlow/contrib/cv/EfficientNet/EfficientNet_V2_ID1220_for_TensorFlow/efficientnet_model.py b/TensorFlow/contrib/cv/EfficientNet/EfficientNet_V2_ID1220_for_TensorFlow/efficientnet_model.py index 569e02c01..845e9b982 100644 --- a/TensorFlow/contrib/cv/EfficientNet/EfficientNet_V2_ID1220_for_TensorFlow/efficientnet_model.py +++ b/TensorFlow/contrib/cv/EfficientNet/EfficientNet_V2_ID1220_for_TensorFlow/efficientnet_model.py @@ -367,7 +367,8 @@ class Model(tf.keras.Model): kernel_initializer=dense_kernel_initializer) if self._global_params.dropout_rate > 0: - self._dropout = tf.keras.layers.Dropout(self._global_params.dropout_rate) + #self._dropout = tf.keras.layers.Dropout(self._global_params.dropout_rate) + from npu_bridge.estimator.npu import npu_convert_dropout else: self._dropout = None -- Gitee From 0ee8fce0bfd7030f3818c249395ee73a85c397c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=86=E6=96=87=E9=9C=9E?= <10511946+lu-wenxia@user.noreply.gitee.com> Date: Tue, 26 Apr 2022 11:53:05 +0000 Subject: [PATCH 07/32] update --- .../efficientnet_model.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/TensorFlow/contrib/cv/EfficientNet/EfficientNet_V2_ID1220_for_TensorFlow/efficientnet_model.py b/TensorFlow/contrib/cv/EfficientNet/EfficientNet_V2_ID1220_for_TensorFlow/efficientnet_model.py index 845e9b982..7c91e6d55 100644 --- a/TensorFlow/contrib/cv/EfficientNet/EfficientNet_V2_ID1220_for_TensorFlow/efficientnet_model.py +++ b/TensorFlow/contrib/cv/EfficientNet/EfficientNet_V2_ID1220_for_TensorFlow/efficientnet_model.py @@ -367,8 +367,9 @@ class Model(tf.keras.Model): kernel_initializer=dense_kernel_initializer) if self._global_params.dropout_rate > 0: - #self._dropout = tf.keras.layers.Dropout(self._global_params.dropout_rate) - from npu_bridge.estimator.npu import npu_convert_dropout + from npu_bridge.estimator.npu import npu_convert_dropout + self._dropout = tf.keras.layers.Dropout(self._global_params.dropout_rate) + else: self._dropout = None -- Gitee From cabb984e4ce4c2442ecce0d6f5fe195b4ee3dad3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=86=E6=96=87=E9=9C=9E?= <10511946+lu-wenxia@user.noreply.gitee.com> Date: Tue, 26 Apr 2022 12:23:24 +0000 Subject: [PATCH 08/32] update --- TensorFlow/contrib/cv/DDCGAN_ID2123_for_TensorFlow/train.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TensorFlow/contrib/cv/DDCGAN_ID2123_for_TensorFlow/train.py b/TensorFlow/contrib/cv/DDCGAN_ID2123_for_TensorFlow/train.py index f07329541..9f37672e5 100644 --- a/TensorFlow/contrib/cv/DDCGAN_ID2123_for_TensorFlow/train.py +++ b/TensorFlow/contrib/cv/DDCGAN_ID2123_for_TensorFlow/train.py @@ -89,7 +89,7 @@ def train(source_imgs, save_path, EPOCHES_set, BATCH_SIZE, logging_period=1, n_b config.graph_options.rewrite_options.remapping = RewriterConfig.OFF config.graph_options.rewrite_options.memory_optimization = RewriterConfig.OFF # create the graph - with tf.Graph().as_default(), tf.Session(config=npu_config_proto()) as sess: + with tf.Graph().as_default(), tf.Session(config=npu_config_proto(),config=config) as sess: SOURCE_VIS = tf.placeholder(tf.float32, shape = (BATCH_SIZE, patch_size, patch_size, 1), name = 'SOURCE_VIS') SOURCE_IR = tf.placeholder(tf.float32, shape = (BATCH_SIZE, patch_size, patch_size, 1), name = 'SOURCE_IR') print('source_vis shape:', SOURCE_VIS.shape) -- Gitee From 3965c03b1539546544b2ef565b9d26bfef809352 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=86=E6=96=87=E9=9C=9E?= <10511946+lu-wenxia@user.noreply.gitee.com> Date: Tue, 26 Apr 2022 12:34:09 +0000 Subject: [PATCH 09/32] update --- .../cv/DDCGAN_ID2123_for_TensorFlow/train.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/TensorFlow/contrib/cv/DDCGAN_ID2123_for_TensorFlow/train.py b/TensorFlow/contrib/cv/DDCGAN_ID2123_for_TensorFlow/train.py index 9f37672e5..f2687a430 100644 --- a/TensorFlow/contrib/cv/DDCGAN_ID2123_for_TensorFlow/train.py +++ b/TensorFlow/contrib/cv/DDCGAN_ID2123_for_TensorFlow/train.py @@ -80,16 +80,13 @@ def train(source_imgs, save_path, EPOCHES_set, BATCH_SIZE, logging_period=1, n_b source_imgs = source_imgs[:-mod] - config = tf.ConfigProto() - - custom_op = config.graph_options.rewrite_options.custom_optimizers.add() - custom_op.name = "NpuOptimizer" - custom_op.parameter_map["use_off_line"].b = True + config_proto = tf.ConfigProto() + custom_op = config_proto.graph_options.rewrite_options.custom_optimizers.add() + custom_op.name = 'NpuOptimizer' custom_op.parameter_map["precision_mode"].s = tf.compat.as_bytes("allow_mix_precision") - config.graph_options.rewrite_options.remapping = RewriterConfig.OFF - config.graph_options.rewrite_options.memory_optimization = RewriterConfig.OFF + config = npu_config_proto(config_proto=config_proto) # create the graph - with tf.Graph().as_default(), tf.Session(config=npu_config_proto(),config=config) as sess: + with tf.Graph().as_default(), tf.Session(config=config) as sess: SOURCE_VIS = tf.placeholder(tf.float32, shape = (BATCH_SIZE, patch_size, patch_size, 1), name = 'SOURCE_VIS') SOURCE_IR = tf.placeholder(tf.float32, shape = (BATCH_SIZE, patch_size, patch_size, 1), name = 'SOURCE_IR') print('source_vis shape:', SOURCE_VIS.shape) -- Gitee From 38839d28413b7628ba94e25251e49265c4fcaf70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=86=E6=96=87=E9=9C=9E?= <10511946+lu-wenxia@user.noreply.gitee.com> Date: Wed, 27 Apr 2022 03:50:28 +0000 Subject: [PATCH 10/32] update --- .../cv/image_synthesis/VAE-GAN_ID1800_for_TensorFlow/utils.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/TensorFlow/built-in/cv/image_synthesis/VAE-GAN_ID1800_for_TensorFlow/utils.py b/TensorFlow/built-in/cv/image_synthesis/VAE-GAN_ID1800_for_TensorFlow/utils.py index 5e8fc0402..86eddd956 100644 --- a/TensorFlow/built-in/cv/image_synthesis/VAE-GAN_ID1800_for_TensorFlow/utils.py +++ b/TensorFlow/built-in/cv/image_synthesis/VAE-GAN_ID1800_for_TensorFlow/utils.py @@ -45,7 +45,8 @@ def encoder(input_tensor, output_size): net = layers.conv2d(net, 32, 5, stride=2) net = layers.conv2d(net, 64, 5, stride=2) net = layers.conv2d(net, 128, 5, stride=2, padding='VALID') - net = layers.dropout(net, keep_prob=0.9) + #net = layers.dropout(net, keep_prob=0.9) + net = npu_ops.dropout(net, keep_prob=0.9) net = layers.flatten(net) return layers.fully_connected(net, output_size, activation_fn=None) -- Gitee From 09828fee0f5b0ca55e1082599f66e4d3789a4855 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=86=E6=96=87=E9=9C=9E?= <10511946+lu-wenxia@user.noreply.gitee.com> Date: Wed, 27 Apr 2022 06:00:51 +0000 Subject: [PATCH 11/32] update --- TensorFlow/contrib/cv/DDCGAN_ID2123_for_TensorFlow/train.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/TensorFlow/contrib/cv/DDCGAN_ID2123_for_TensorFlow/train.py b/TensorFlow/contrib/cv/DDCGAN_ID2123_for_TensorFlow/train.py index f2687a430..8fdc42d77 100644 --- a/TensorFlow/contrib/cv/DDCGAN_ID2123_for_TensorFlow/train.py +++ b/TensorFlow/contrib/cv/DDCGAN_ID2123_for_TensorFlow/train.py @@ -179,6 +179,7 @@ def train(source_imgs, save_path, EPOCHES_set, BATCH_SIZE, logging_period=1, n_b num_imgs = source_imgs.shape[0] for epoch in range(EPOCHS): + Start_Time1 = time.time() np.random.shuffle(source_imgs) for batch in range(n_batches): step += 1 @@ -237,6 +238,7 @@ def train(source_imgs, save_path, EPOCHES_set, BATCH_SIZE, logging_period=1, n_b 'learning_rate: %s, elapsed_time: %s, TrainingTime: %s\n' % (batch, epoch + 1, EPOCHS, g_loss, d1_loss, d2_loss, lr, elapsed_time, datetime.now())) # 将字符串写入文件中 + end_time=time.time()-Start_Time1 #if batch % 10 == 0: #elapsed_time = datetime.now() - start_time -- Gitee From 4d63db3e94c86d87e9d240ef9e82c7c8e1366fba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=86=E6=96=87=E9=9C=9E?= <10511946+lu-wenxia@user.noreply.gitee.com> Date: Wed, 27 Apr 2022 06:17:56 +0000 Subject: [PATCH 12/32] update --- TensorFlow/contrib/cv/DDCGAN_ID2123_for_TensorFlow/train.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/TensorFlow/contrib/cv/DDCGAN_ID2123_for_TensorFlow/train.py b/TensorFlow/contrib/cv/DDCGAN_ID2123_for_TensorFlow/train.py index 8fdc42d77..09815c8ee 100644 --- a/TensorFlow/contrib/cv/DDCGAN_ID2123_for_TensorFlow/train.py +++ b/TensorFlow/contrib/cv/DDCGAN_ID2123_for_TensorFlow/train.py @@ -179,7 +179,6 @@ def train(source_imgs, save_path, EPOCHES_set, BATCH_SIZE, logging_period=1, n_b num_imgs = source_imgs.shape[0] for epoch in range(EPOCHS): - Start_Time1 = time.time() np.random.shuffle(source_imgs) for batch in range(n_batches): step += 1 @@ -238,7 +237,6 @@ def train(source_imgs, save_path, EPOCHES_set, BATCH_SIZE, logging_period=1, n_b 'learning_rate: %s, elapsed_time: %s, TrainingTime: %s\n' % (batch, epoch + 1, EPOCHS, g_loss, d1_loss, d2_loss, lr, elapsed_time, datetime.now())) # 将字符串写入文件中 - end_time=time.time()-Start_Time1 #if batch % 10 == 0: #elapsed_time = datetime.now() - start_time @@ -248,7 +246,6 @@ def train(source_imgs, save_path, EPOCHES_set, BATCH_SIZE, logging_period=1, n_b #print("lr: %s, elapsed_time: %s\n" % (lr, elapsed_time)) - result = sess.run(merged, feed_dict=FEED_DICT) writer.add_summary(result, step) if step % logging_period == 0: -- Gitee From 8d7bf8eacb17857298a05cab8e30882ef5f3c4d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=86=E6=96=87=E9=9C=9E?= <10511946+lu-wenxia@user.noreply.gitee.com> Date: Wed, 27 Apr 2022 07:37:22 +0000 Subject: [PATCH 13/32] update --- TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/main.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/main.py b/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/main.py index 71766d837..2ad7444d7 100644 --- a/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/main.py +++ b/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/main.py @@ -132,6 +132,8 @@ def main(): custom_op.name = "NpuOptimizer" custom_op.parameter_map["precision_mode"].s = tf.compat.as_bytes("allow_mix_precision") custom_op.parameter_map["use_off_line"].b = True + custom_op.parameter_map["enable_data_pre_proc"].b = True # getnext算子下沉是迭代循环下沉的必要条件 + # custom_op.parameter_map["iterations_per_loop"].i = 10 # dump data -- Gitee From 8d24a1c26a8342702b21257fbfa578cc9282619d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=86=E6=96=87=E9=9C=9E?= <10511946+lu-wenxia@user.noreply.gitee.com> Date: Wed, 27 Apr 2022 08:10:57 +0000 Subject: [PATCH 14/32] update --- .../Milking_cowmask_ID0712_for_TensorFlow/architectures/model.py | 1 + 1 file changed, 1 insertion(+) diff --git a/TensorFlow/contrib/cv/Milking_cowmask_ID0712_for_TensorFlow/architectures/model.py b/TensorFlow/contrib/cv/Milking_cowmask_ID0712_for_TensorFlow/architectures/model.py index 967ddc654..88b3bca38 100644 --- a/TensorFlow/contrib/cv/Milking_cowmask_ID0712_for_TensorFlow/architectures/model.py +++ b/TensorFlow/contrib/cv/Milking_cowmask_ID0712_for_TensorFlow/architectures/model.py @@ -150,6 +150,7 @@ class Model(): config_proto = tf.ConfigProto() custom_op = config_proto.graph_options.rewrite_options.custom_optimizers.add() custom_op.name = 'NpuOptimizer' + custom_op.parameter_map["enable_data_pre_proc"].b = True # getnext算子下沉是迭代循环下沉的必要条件 custom_op.parameter_map["precision_mode"].s = tf.compat.as_bytes("allow_mix_precision") config = npu_config_proto(config_proto=config_proto) self.sess = tf.Session(config=config) -- Gitee From f11e31d1ab2887de9b382306f24136d2f3ff2b9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=86=E6=96=87=E9=9C=9E?= <10511946+lu-wenxia@user.noreply.gitee.com> Date: Wed, 27 Apr 2022 08:38:36 +0000 Subject: [PATCH 15/32] update --- .../ResUNetplusplus_ID0275_for_Tensorflow/run.py | 1 + 1 file changed, 1 insertion(+) diff --git a/TensorFlow/built-in/cv/image_segmentation/ResUNetplusplus_ID0275_for_Tensorflow/run.py b/TensorFlow/built-in/cv/image_segmentation/ResUNetplusplus_ID0275_for_Tensorflow/run.py index d62bc0cd1..44da3ad6a 100644 --- a/TensorFlow/built-in/cv/image_segmentation/ResUNetplusplus_ID0275_for_Tensorflow/run.py +++ b/TensorFlow/built-in/cv/image_segmentation/ResUNetplusplus_ID0275_for_Tensorflow/run.py @@ -88,6 +88,7 @@ custom_op.name = "NpuOptimizer" custom_op.parameter_map["dynamic_input"].b = True custom_op.parameter_map["dynamic_graph_execute_mode"].s = tf.compat.as_bytes("lazy_recompile") custom_op.parameter_map["precision_mode"].s = tf.compat.as_bytes("allow_mix_precision") +custom_op.parameter_map["enable_data_pre_proc"].b = True # getnext算子下沉是迭代循环下沉的必要条件 # custom_op.parameter_map["variable_memory_max_size"].s = tf.compat.as_bytes(str(8*1024 * 1024 * 1024)) # custom_op.parameter_map["dump_path"].s = tf.compat.as_bytes("/home/ma-user/work/rupp/data_dump") -- Gitee From 1dac819f23a25a70263fcfb9e5576c75c50197bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=86=E6=96=87=E9=9C=9E?= <10511946+lu-wenxia@user.noreply.gitee.com> Date: Wed, 27 Apr 2022 09:34:29 +0000 Subject: [PATCH 16/32] update --- .../contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/main.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/main.py b/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/main.py index 2ad7444d7..cd4030894 100644 --- a/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/main.py +++ b/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/main.py @@ -133,8 +133,8 @@ def main(): custom_op.parameter_map["precision_mode"].s = tf.compat.as_bytes("allow_mix_precision") custom_op.parameter_map["use_off_line"].b = True custom_op.parameter_map["enable_data_pre_proc"].b = True # getnext算子下沉是迭代循环下沉的必要条件 - # custom_op.parameter_map["iterations_per_loop"].i = 10 - + custom_op.parameter_map["iterations_per_loop"].i = 10 #此处设置的值和set_iteration_per_loop设置的iterations_per_loop值保持一致，用于判断是否进行训练迭代下沉 + config = npu_config_proto(config_proto=config) # dump data # custom_op.parameter_map["enable_dump"].b = True @@ -158,6 +158,9 @@ def main(): # with tf.Session(config=tf.ConfigProto(allow_soft_placement=True)) as sess: with tf.Session(config=config) as sess: + sess.run(init) + # sess.run模式下设置小循环次数为10 + train_op = util.set_iteration_per_loop(sess, optimizer, 10) gan = StarGAN_v2(sess, args) # build graph -- Gitee From b3cdb06ca2f7f9062829ebef9389db00392284c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=86=E6=96=87=E9=9C=9E?= <10511946+lu-wenxia@user.noreply.gitee.com> Date: Thu, 28 Apr 2022 06:20:50 +0000 Subject: [PATCH 17/32] update --- .../contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/main.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/main.py b/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/main.py index cd4030894..05dd5a8ed 100644 --- a/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/main.py +++ b/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/main.py @@ -134,7 +134,7 @@ def main(): custom_op.parameter_map["use_off_line"].b = True custom_op.parameter_map["enable_data_pre_proc"].b = True # getnext算子下沉是迭代循环下沉的必要条件 custom_op.parameter_map["iterations_per_loop"].i = 10 #此处设置的值和set_iteration_per_loop设置的iterations_per_loop值保持一致，用于判断是否进行训练迭代下沉 - config = npu_config_proto(config_proto=config) + # dump data # custom_op.parameter_map["enable_dump"].b = True @@ -158,9 +158,6 @@ def main(): # with tf.Session(config=tf.ConfigProto(allow_soft_placement=True)) as sess: with tf.Session(config=config) as sess: - sess.run(init) - # sess.run模式下设置小循环次数为10 - train_op = util.set_iteration_per_loop(sess, optimizer, 10) gan = StarGAN_v2(sess, args) # build graph -- Gitee From 64bdd56201bb1c9b2e3e17d9797222542684c8e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=86=E6=96=87=E9=9C=9E?= <10511946+lu-wenxia@user.noreply.gitee.com> Date: Thu, 28 Apr 2022 06:23:38 +0000 Subject: [PATCH 18/32] update --- .../contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/StarGAN_v2.py | 1 + 1 file changed, 1 insertion(+) diff --git a/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/StarGAN_v2.py b/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/StarGAN_v2.py index b42b821e2..0845cd7e9 100644 --- a/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/StarGAN_v2.py +++ b/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/StarGAN_v2.py @@ -551,6 +551,7 @@ class StarGAN_v2() : # restore check-point if it exits could_load, checkpoint_counter = self.load(self.checkpoint_dir) + train_op = util.set_iteration_per_loop(sess, optimizer, 10) if could_load: start_batch_id = checkpoint_counter counter = checkpoint_counter -- Gitee From 961c14158adbbf2451d05e404fa31545bd756bfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=86=E6=96=87=E9=9C=9E?= <10511946+lu-wenxia@user.noreply.gitee.com> Date: Thu, 28 Apr 2022 06:42:14 +0000 Subject: [PATCH 19/32] update --- .../contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/StarGAN_v2.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/StarGAN_v2.py b/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/StarGAN_v2.py index 0845cd7e9..2bf795295 100644 --- a/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/StarGAN_v2.py +++ b/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/StarGAN_v2.py @@ -551,7 +551,7 @@ class StarGAN_v2() : # restore check-point if it exits could_load, checkpoint_counter = self.load(self.checkpoint_dir) - train_op = util.set_iteration_per_loop(sess, optimizer, 10) + train_op = util.set_iteration_per_loop(self.sess, optimizer, 10) if could_load: start_batch_id = checkpoint_counter counter = checkpoint_counter -- Gitee From d2c34245497b41cc70c614e3c67049d05d5d3597 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=86=E6=96=87=E9=9C=9E?= <10511946+lu-wenxia@user.noreply.gitee.com> Date: Thu, 28 Apr 2022 07:36:00 +0000 Subject: [PATCH 20/32] update --- .../cv/StarGAN_v2_ID1188_for_TensorFlow/StarGAN_v2.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/StarGAN_v2.py b/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/StarGAN_v2.py index 2bf795295..3b10a1106 100644 --- a/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/StarGAN_v2.py +++ b/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/StarGAN_v2.py @@ -551,7 +551,9 @@ class StarGAN_v2() : # restore check-point if it exits could_load, checkpoint_counter = self.load(self.checkpoint_dir) - train_op = util.set_iteration_per_loop(self.sess, optimizer, 10) + train_op_g = util.set_iteration_per_loop(self.sess, prev_g_optimizer, 10) + train_op_e = util.set_iteration_per_loop(self.sess, prev_e_optimizer, 10) + train_op_f = util.set_iteration_per_loop(self.sess, prev_f_optimizer, 10) if could_load: start_batch_id = checkpoint_counter counter = checkpoint_counter @@ -616,7 +618,7 @@ class StarGAN_v2() : g_loss = past_g_loss time_one_iter = time.time() - start_time - fps = 1.0 * self.batch_size / time_one_iter + fps = 1.0*10 * self.batch_size / time_one_iter print("iter: [%6d/%6d] time: %4.4f d_loss: %.8f g_loss: %.8f fps %.8f" % (idx, self.iteration, time_one_iter, d_loss, g_loss, fps)) if np.mod(idx+1, self.print_freq) == 0 : -- Gitee From 88d3830fafebffa2313686896a786fb02bdf819b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=86=E6=96=87=E9=9C=9E?= <10511946+lu-wenxia@user.noreply.gitee.com> Date: Thu, 28 Apr 2022 07:42:49 +0000 Subject: [PATCH 21/32] update --- .../cv/StarGAN_v2_ID1188_for_TensorFlow/StarGAN_v2.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/StarGAN_v2.py b/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/StarGAN_v2.py index 3b10a1106..4e2d1f2b6 100644 --- a/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/StarGAN_v2.py +++ b/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/StarGAN_v2.py @@ -551,6 +551,7 @@ class StarGAN_v2() : # restore check-point if it exits could_load, checkpoint_counter = self.load(self.checkpoint_dir) + train_op_d = util.set_iteration_per_loop(self.sess, self.d_optimizer, 10) train_op_g = util.set_iteration_per_loop(self.sess, prev_g_optimizer, 10) train_op_e = util.set_iteration_per_loop(self.sess, prev_e_optimizer, 10) train_op_f = util.set_iteration_per_loop(self.sess, prev_f_optimizer, 10) @@ -600,14 +601,14 @@ class StarGAN_v2() : } # Update D - _, d_loss, summary_str = self.sess.run([self.d_optimizer, self.d_loss, self.d_summary_loss], feed_dict = train_feed_dict) + _, d_loss, summary_str = self.sess.run([train_op_d, self.d_loss, self.d_summary_loss], feed_dict = train_feed_dict) self.writer.add_summary(summary_str, counter) # Update G g_loss = None if (counter - 1) % self.n_critic == 0 : real_images, fake_images, _, _, _, g_loss, summary_str = self.sess.run([self.x_real, self.x_fake_list, - self.g_optimizer, self.e_optimizer, self.f_optimizer, + train_op_g, train_op_e, train_op_f, self.g_loss, self.g_summary_loss], feed_dict = train_feed_dict) self.writer.add_summary(summary_str, counter) past_g_loss = g_loss -- Gitee From 602626ecd38475a590a0411f833d278748ba660c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=86=E6=96=87=E9=9C=9E?= <10511946+lu-wenxia@user.noreply.gitee.com> Date: Thu, 28 Apr 2022 08:04:15 +0000 Subject: [PATCH 22/32] update --- .../StarGAN_v2_ID1188_for_TensorFlow/StarGAN_v2.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/StarGAN_v2.py b/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/StarGAN_v2.py index 4e2d1f2b6..3938b782d 100644 --- a/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/StarGAN_v2.py +++ b/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/StarGAN_v2.py @@ -441,9 +441,9 @@ class StarGAN_v2() : D_vars = [var for var in t_vars if 'discriminator' in var.name] if self.gpu_num == 1 : - prev_g_optimizer = tf.train.AdamOptimizer(self.lr, beta1=0, beta2=0.99).minimize(self.g_loss, var_list=G_vars) - prev_e_optimizer = tf.train.AdamOptimizer(self.lr, beta1=0, beta2=0.99).minimize(self.g_loss, var_list=E_vars) - prev_f_optimizer = tf.train.AdamOptimizer(self.lr * 0.01, beta1=0, beta2=0.99).minimize(self.g_loss, var_list=F_vars) + self.prev_g_optimizer = prev_g_optimizer = tf.train.AdamOptimizer(self.lr, beta1=0, beta2=0.99).minimize(self.g_loss, var_list=G_vars) + self.prev_e_optimizer = prev_e_optimizer = tf.train.AdamOptimizer(self.lr, beta1=0, beta2=0.99).minimize(self.g_loss, var_list=E_vars) + self.prev_f_optimizer = prev_f_optimizer = tf.train.AdamOptimizer(self.lr * 0.01, beta1=0, beta2=0.99).minimize(self.g_loss, var_list=F_vars) self.d_optimizer = tf.train.AdamOptimizer(self.lr, beta1=0, beta2=0.99).minimize(self.d_loss, var_list=D_vars) @@ -552,9 +552,9 @@ class StarGAN_v2() : # restore check-point if it exits could_load, checkpoint_counter = self.load(self.checkpoint_dir) train_op_d = util.set_iteration_per_loop(self.sess, self.d_optimizer, 10) - train_op_g = util.set_iteration_per_loop(self.sess, prev_g_optimizer, 10) - train_op_e = util.set_iteration_per_loop(self.sess, prev_e_optimizer, 10) - train_op_f = util.set_iteration_per_loop(self.sess, prev_f_optimizer, 10) + train_op_g = util.set_iteration_per_loop(self.sess, self.prev_g_optimizer, 10) + train_op_e = util.set_iteration_per_loop(self.sess, self.prev_e_optimizer, 10) + train_op_f = util.set_iteration_per_loop(self.sess, self.prev_f_optimizer, 10) if could_load: start_batch_id = checkpoint_counter counter = checkpoint_counter -- Gitee From 586c84951c34e60717023ee8bb3dc8fb78e69e6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=86=E6=96=87=E9=9C=9E?= <10511946+lu-wenxia@user.noreply.gitee.com> Date: Thu, 28 Apr 2022 08:45:49 +0000 Subject: [PATCH 23/32] update --- .../cv/StarGAN_v2_ID1188_for_TensorFlow/StarGAN_v2.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/StarGAN_v2.py b/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/StarGAN_v2.py index 3938b782d..66112559a 100644 --- a/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/StarGAN_v2.py +++ b/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/StarGAN_v2.py @@ -551,10 +551,10 @@ class StarGAN_v2() : # restore check-point if it exits could_load, checkpoint_counter = self.load(self.checkpoint_dir) - train_op_d = util.set_iteration_per_loop(self.sess, self.d_optimizer, 10) - train_op_g = util.set_iteration_per_loop(self.sess, self.prev_g_optimizer, 10) - train_op_e = util.set_iteration_per_loop(self.sess, self.prev_e_optimizer, 10) - train_op_f = util.set_iteration_per_loop(self.sess, self.prev_f_optimizer, 10) + train_op_d = util.set_iteration_per_loop(self.sess, self.d_optimizer, 1) + train_op_g = util.set_iteration_per_loop(self.sess, self.prev_g_optimizer, 1) + train_op_e = util.set_iteration_per_loop(self.sess, self.prev_e_optimizer, 1) + train_op_f = util.set_iteration_per_loop(self.sess, self.prev_f_optimizer, 1) if could_load: start_batch_id = checkpoint_counter counter = checkpoint_counter @@ -619,7 +619,7 @@ class StarGAN_v2() : g_loss = past_g_loss time_one_iter = time.time() - start_time - fps = 1.0*10 * self.batch_size / time_one_iter + fps = 1.0 * self.batch_size / time_one_iter print("iter: [%6d/%6d] time: %4.4f d_loss: %.8f g_loss: %.8f fps %.8f" % (idx, self.iteration, time_one_iter, d_loss, g_loss, fps)) if np.mod(idx+1, self.print_freq) == 0 : -- Gitee From 734ef4c72433ccfad990a206d4cc9aa543ce8404 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=86=E6=96=87=E9=9C=9E?= <10511946+lu-wenxia@user.noreply.gitee.com> Date: Thu, 28 Apr 2022 08:59:12 +0000 Subject: [PATCH 24/32] update --- TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/main.py b/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/main.py index 05dd5a8ed..9848788a4 100644 --- a/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/main.py +++ b/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/main.py @@ -133,7 +133,7 @@ def main(): custom_op.parameter_map["precision_mode"].s = tf.compat.as_bytes("allow_mix_precision") custom_op.parameter_map["use_off_line"].b = True custom_op.parameter_map["enable_data_pre_proc"].b = True # getnext算子下沉是迭代循环下沉的必要条件 - custom_op.parameter_map["iterations_per_loop"].i = 10 #此处设置的值和set_iteration_per_loop设置的iterations_per_loop值保持一致，用于判断是否进行训练迭代下沉 + custom_op.parameter_map["iterations_per_loop"].i = 1 #此处设置的值和set_iteration_per_loop设置的iterations_per_loop值保持一致，用于判断是否进行训练迭代下沉 # dump data -- Gitee From 504d176bb4d087ccd2b2bc92eb1e43af080cf52c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=86=E6=96=87=E9=9C=9E?= <10511946+lu-wenxia@user.noreply.gitee.com> Date: Thu, 28 Apr 2022 12:02:34 +0000 Subject: [PATCH 25/32] update --- .../test/train_performance_1p.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/test/train_performance_1p.sh b/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/test/train_performance_1p.sh index 2ada4a0e0..d8fbaad31 100644 --- a/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/test/train_performance_1p.sh +++ b/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/test/train_performance_1p.sh @@ -20,7 +20,7 @@ Network="StarGAN_v2_ID1188_for_TensorFlow" # 训练的batch_size batch_size=4 # 控制训练时长的参数，视各模型修改---少量epoch -epochs=4 +epochs=40 # case名称 少量epoch-train_performance_1p.sh传入perf，全量-train_full_1p.sh传入acc # file_name as your file name -- Gitee From 3c5411ac4948c70a909edb9b0425d0ac955c8d5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=86=E6=96=87=E9=9C=9E?= <10511946+lu-wenxia@user.noreply.gitee.com> Date: Thu, 28 Apr 2022 12:14:43 +0000 Subject: [PATCH 26/32] update --- .../cv/StarGAN_v2_ID1188_for_TensorFlow/StarGAN_v2.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/StarGAN_v2.py b/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/StarGAN_v2.py index 66112559a..fc5000c52 100644 --- a/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/StarGAN_v2.py +++ b/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/StarGAN_v2.py @@ -551,10 +551,10 @@ class StarGAN_v2() : # restore check-point if it exits could_load, checkpoint_counter = self.load(self.checkpoint_dir) - train_op_d = util.set_iteration_per_loop(self.sess, self.d_optimizer, 1) - train_op_g = util.set_iteration_per_loop(self.sess, self.prev_g_optimizer, 1) - train_op_e = util.set_iteration_per_loop(self.sess, self.prev_e_optimizer, 1) - train_op_f = util.set_iteration_per_loop(self.sess, self.prev_f_optimizer, 1) + train_op_d = util.set_iteration_per_loop(self.sess, self.d_optimizer, 10) + train_op_g = util.set_iteration_per_loop(self.sess, self.prev_g_optimizer, 10) + train_op_e = util.set_iteration_per_loop(self.sess, self.prev_e_optimizer, 10) + train_op_f = util.set_iteration_per_loop(self.sess, self.prev_f_optimizer, 10) if could_load: start_batch_id = checkpoint_counter counter = checkpoint_counter @@ -618,7 +618,8 @@ class StarGAN_v2() : if g_loss == None : g_loss = past_g_loss - time_one_iter = time.time() - start_time + time_one_iter = (time.time() - start_time)/10 + fps = 1.0 * self.batch_size / time_one_iter print("iter: [%6d/%6d] time: %4.4f d_loss: %.8f g_loss: %.8f fps %.8f" % (idx, self.iteration, time_one_iter, d_loss, g_loss, fps)) -- Gitee From 1293bc86d6a2dd4f0e103c2bd1a35298e4ba540e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=86=E6=96=87=E9=9C=9E?= <10511946+lu-wenxia@user.noreply.gitee.com> Date: Thu, 28 Apr 2022 12:15:53 +0000 Subject: [PATCH 27/32] update --- .../contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/StarGAN_v2.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/StarGAN_v2.py b/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/StarGAN_v2.py index fc5000c52..252661936 100644 --- a/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/StarGAN_v2.py +++ b/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/StarGAN_v2.py @@ -620,7 +620,7 @@ class StarGAN_v2() : time_one_iter = (time.time() - start_time)/10 - fps = 1.0 * self.batch_size / time_one_iter + fps = 1.0 *10* self.batch_size / time_one_iter print("iter: [%6d/%6d] time: %4.4f d_loss: %.8f g_loss: %.8f fps %.8f" % (idx, self.iteration, time_one_iter, d_loss, g_loss, fps)) if np.mod(idx+1, self.print_freq) == 0 : -- Gitee From d4c088eba045da5d3107174180a4fe6abb2ba99f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=86=E6=96=87=E9=9C=9E?= <10511946+lu-wenxia@user.noreply.gitee.com> Date: Thu, 28 Apr 2022 12:16:52 +0000 Subject: [PATCH 28/32] update --- TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/main.py b/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/main.py index 9848788a4..05dd5a8ed 100644 --- a/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/main.py +++ b/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/main.py @@ -133,7 +133,7 @@ def main(): custom_op.parameter_map["precision_mode"].s = tf.compat.as_bytes("allow_mix_precision") custom_op.parameter_map["use_off_line"].b = True custom_op.parameter_map["enable_data_pre_proc"].b = True # getnext算子下沉是迭代循环下沉的必要条件 - custom_op.parameter_map["iterations_per_loop"].i = 1 #此处设置的值和set_iteration_per_loop设置的iterations_per_loop值保持一致，用于判断是否进行训练迭代下沉 + custom_op.parameter_map["iterations_per_loop"].i = 10 #此处设置的值和set_iteration_per_loop设置的iterations_per_loop值保持一致，用于判断是否进行训练迭代下沉 # dump data -- Gitee From 91349f9b736b906eeb66b13a1188f2e94912bd51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=86=E6=96=87=E9=9C=9E?= <10511946+lu-wenxia@user.noreply.gitee.com> Date: Thu, 28 Apr 2022 12:26:44 +0000 Subject: [PATCH 29/32] update --- .../test/train_performance_1p.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/test/train_performance_1p.sh b/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/test/train_performance_1p.sh index d8fbaad31..893b5944c 100644 --- a/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/test/train_performance_1p.sh +++ b/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/test/train_performance_1p.sh @@ -20,7 +20,7 @@ Network="StarGAN_v2_ID1188_for_TensorFlow" # 训练的batch_size batch_size=4 # 控制训练时长的参数，视各模型修改---少量epoch -epochs=40 +epochs=400 # case名称 少量epoch-train_performance_1p.sh传入perf，全量-train_full_1p.sh传入acc # file_name as your file name -- Gitee From 0d0945df304a7a86374ae3233c769042c821f6de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=86=E6=96=87=E9=9C=9E?= <10511946+lu-wenxia@user.noreply.gitee.com> Date: Thu, 28 Apr 2022 12:34:00 +0000 Subject: [PATCH 30/32] update --- .../contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/StarGAN_v2.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/StarGAN_v2.py b/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/StarGAN_v2.py index 252661936..bcba2e450 100644 --- a/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/StarGAN_v2.py +++ b/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/StarGAN_v2.py @@ -618,7 +618,7 @@ class StarGAN_v2() : if g_loss == None : g_loss = past_g_loss - time_one_iter = (time.time() - start_time)/10 + time_one_iter = time.time() - start_time fps = 1.0 *10* self.batch_size / time_one_iter print("iter: [%6d/%6d] time: %4.4f d_loss: %.8f g_loss: %.8f fps %.8f" % (idx, self.iteration, time_one_iter, d_loss, g_loss, fps)) -- Gitee From 66869113041771222027436227d85ca2bc53a59d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=86=E6=96=87=E9=9C=9E?= <10511946+lu-wenxia@user.noreply.gitee.com> Date: Thu, 28 Apr 2022 12:34:25 +0000 Subject: [PATCH 31/32] update --- .../test/train_performance_1p.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/test/train_performance_1p.sh b/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/test/train_performance_1p.sh index 893b5944c..d8fbaad31 100644 --- a/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/test/train_performance_1p.sh +++ b/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/test/train_performance_1p.sh @@ -20,7 +20,7 @@ Network="StarGAN_v2_ID1188_for_TensorFlow" # 训练的batch_size batch_size=4 # 控制训练时长的参数，视各模型修改---少量epoch -epochs=400 +epochs=40 # case名称 少量epoch-train_performance_1p.sh传入perf，全量-train_full_1p.sh传入acc # file_name as your file name -- Gitee From 2ac28b733285dae90fbad9f3d61dfe10308aec1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=86=E6=96=87=E9=9C=9E?= <10511946+lu-wenxia@user.noreply.gitee.com> Date: Fri, 29 Apr 2022 02:53:45 +0000 Subject: [PATCH 32/32] update --- .../contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/StarGAN_v2.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/StarGAN_v2.py b/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/StarGAN_v2.py index bcba2e450..bb5bb3141 100644 --- a/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/StarGAN_v2.py +++ b/TensorFlow/contrib/cv/StarGAN_v2_ID1188_for_TensorFlow/StarGAN_v2.py @@ -311,7 +311,7 @@ class StarGAN_v2() : drop_remainder=True)) # .apply(prefetch_to_device(gpu_device, None)) - img_and_label_iterator = img_and_label.make_one_shot_iterator() + img_and_label_iterator = img_and_label.make_initializable_iterator() self.x_real, label_org = img_and_label_iterator.get_next() # [bs, 256, 256, 3], [bs, 1] # label_trg = tf.random_shuffle(label_org) # Target domain labels -- Gitee