From f8d6f9583da859e1f5053c2689eafae5c3031553 Mon Sep 17 00:00:00 2001 From: ChaiBapchya Date: Mon, 15 Jul 2019 12:30:46 -0700 Subject: [PATCH 1/8] normal, uniform ops --- benchmark/opperf/nd_operations/random_sampling_operators.py | 4 ++-- benchmark/opperf/utils/op_registry_utils.py | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/benchmark/opperf/nd_operations/random_sampling_operators.py b/benchmark/opperf/nd_operations/random_sampling_operators.py index d0cf2c2fea4a..ffb577228f66 100644 --- a/benchmark/opperf/nd_operations/random_sampling_operators.py +++ b/benchmark/opperf/nd_operations/random_sampling_operators.py @@ -19,12 +19,12 @@ 1. Operators are automatically fetched from MXNet operator registry. 2. Default Inputs are generated. See rules/default_params.py. You can override the default values. -Below 16 random sampling Operators are covered: +Below 18 random sampling Operators are covered: ['random_exponential', 'random_gamma', 'random_generalized_negative_binomial', 'random_negative_binomial', 'random_normal', 'random_poisson', 'random_randint', 'random_uniform', 'sample_exponential', 'sample_gamma', 'sample_generalized_negative_binomial', 'sample_multinomial', 'sample_negative_binomial', 'sample_normal', -'sample_poisson', 'sample_uniform'] +'sample_poisson', 'sample_uniform', 'uniform', 'normal'] """ diff --git a/benchmark/opperf/utils/op_registry_utils.py b/benchmark/opperf/utils/op_registry_utils.py index 6509be37f39d..70be185414d2 100644 --- a/benchmark/opperf/utils/op_registry_utils.py +++ b/benchmark/opperf/utils/op_registry_utils.py @@ -212,10 +212,13 @@ def get_all_random_sampling_operators(): # Get all mxnet operators mx_operators = _get_all_mxnet_operators() + # Deprecated random sampling operators + deprecate_ops = ['uniform', 'normal'] + # Filter for Random Sampling operators random_sampling_mx_operators = {} for op_name, op_params in mx_operators.items(): - if op_name.startswith(("random_", "sample_")) and op_name not in unique_ops: + if op_name.startswith(("random_", "sample_")) or op_name in deprecate_ops and op_name not in unique_ops: random_sampling_mx_operators[op_name] = mx_operators[op_name] return random_sampling_mx_operators From 84060367fe1dcd465c3d86f02bd51df566471287 Mon Sep 17 00:00:00 2001 From: ChaiBapchya Date: Tue, 16 Jul 2019 16:44:55 -0700 Subject: [PATCH 2/8] Revert "normal, uniform ops" This reverts commit f8d6f9583da859e1f5053c2689eafae5c3031553. --- benchmark/opperf/nd_operations/random_sampling_operators.py | 4 ++-- benchmark/opperf/utils/op_registry_utils.py | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/benchmark/opperf/nd_operations/random_sampling_operators.py b/benchmark/opperf/nd_operations/random_sampling_operators.py index ffb577228f66..d0cf2c2fea4a 100644 --- a/benchmark/opperf/nd_operations/random_sampling_operators.py +++ b/benchmark/opperf/nd_operations/random_sampling_operators.py @@ -19,12 +19,12 @@ 1. Operators are automatically fetched from MXNet operator registry. 2. Default Inputs are generated. See rules/default_params.py. You can override the default values. -Below 18 random sampling Operators are covered: +Below 16 random sampling Operators are covered: ['random_exponential', 'random_gamma', 'random_generalized_negative_binomial', 'random_negative_binomial', 'random_normal', 'random_poisson', 'random_randint', 'random_uniform', 'sample_exponential', 'sample_gamma', 'sample_generalized_negative_binomial', 'sample_multinomial', 'sample_negative_binomial', 'sample_normal', -'sample_poisson', 'sample_uniform', 'uniform', 'normal'] +'sample_poisson', 'sample_uniform'] """ diff --git a/benchmark/opperf/utils/op_registry_utils.py b/benchmark/opperf/utils/op_registry_utils.py index 70be185414d2..6509be37f39d 100644 --- a/benchmark/opperf/utils/op_registry_utils.py +++ b/benchmark/opperf/utils/op_registry_utils.py @@ -212,13 +212,10 @@ def get_all_random_sampling_operators(): # Get all mxnet operators mx_operators = _get_all_mxnet_operators() - # Deprecated random sampling operators - deprecate_ops = ['uniform', 'normal'] - # Filter for Random Sampling operators random_sampling_mx_operators = {} for op_name, op_params in mx_operators.items(): - if op_name.startswith(("random_", "sample_")) or op_name in deprecate_ops and op_name not in unique_ops: + if op_name.startswith(("random_", "sample_")) and op_name not in unique_ops: random_sampling_mx_operators[op_name] = mx_operators[op_name] return random_sampling_mx_operators From da3caa72ce572962dbf78be83d0016e02639af1e Mon Sep 17 00:00:00 2001 From: ChaiBapchya Date: Tue, 16 Jul 2019 16:45:41 -0700 Subject: [PATCH 3/8] filter out deprecated ops --- benchmark/opperf/utils/op_registry_utils.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/benchmark/opperf/utils/op_registry_utils.py b/benchmark/opperf/utils/op_registry_utils.py index 6509be37f39d..fceb8e305943 100644 --- a/benchmark/opperf/utils/op_registry_utils.py +++ b/benchmark/opperf/utils/op_registry_utils.py @@ -39,6 +39,8 @@ def _select_ops(operator_names, filters=("_contrib", "_"), merge_op_forward_back By default, filter out all Contrib operators that starts with '_contrib' and internal operators that starts with '_'. + Note - All deprecated operators are filtered out as well. + Parameters ---------- operator_names: List[str] @@ -55,6 +57,9 @@ def _select_ops(operator_names, filters=("_contrib", "_"), merge_op_forward_back mx_operators = {} operators_with_backward = [] + # Filter out deprecated operators + filters += ("normal","uniform") + if merge_op_forward_backward: filters += ("_backward",) From 1a328edde5923a3bc69c66a8127196861064318f Mon Sep 17 00:00:00 2001 From: ChaiBapchya Date: Wed, 17 Jul 2019 10:58:07 -0700 Subject: [PATCH 4/8] Trigger notification From 7f5348846db6c991a434b287e144a7bc585d1dd2 Mon Sep 17 00:00:00 2001 From: ChaiBapchya Date: Wed, 17 Jul 2019 18:09:56 -0700 Subject: [PATCH 5/8] additional deprecated ops --- benchmark/opperf/utils/op_registry_utils.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/benchmark/opperf/utils/op_registry_utils.py b/benchmark/opperf/utils/op_registry_utils.py index fceb8e305943..27da358852a8 100644 --- a/benchmark/opperf/utils/op_registry_utils.py +++ b/benchmark/opperf/utils/op_registry_utils.py @@ -58,7 +58,9 @@ def _select_ops(operator_names, filters=("_contrib", "_"), merge_op_forward_back operators_with_backward = [] # Filter out deprecated operators - filters += ("normal","uniform") + filters += ("normal", "uniform", "BatchNorm_v1", "Flatten", "contrib_CTCLoss", "Pad", "Cast", + "Pooling_v1", "Concat", "Reshape", "Convolution_v1", "SliceChannel", "Crop", + "crop", "onehot_encode") if merge_op_forward_backward: filters += ("_backward",) From 3801ba341fb2914de1189d4ba8f85c8e062daf7b Mon Sep 17 00:00:00 2001 From: ChaiBapchya Date: Wed, 17 Jul 2019 22:18:39 -0700 Subject: [PATCH 6/8] Trigger notification From 376e840c9564b21de3f1695d5ad010ed12dd0dc0 Mon Sep 17 00:00:00 2001 From: ChaiBapchya Date: Fri, 19 Jul 2019 16:15:22 -0700 Subject: [PATCH 7/8] Trigger notification From e9bee74a1497d0527de9b6a59efd3251081b6e9b Mon Sep 17 00:00:00 2001 From: ChaiBapchya Date: Thu, 15 Aug 2019 14:29:23 -0700 Subject: [PATCH 8/8] Trigger notification