diff --git a/python/paddle/fluid/tests/unittests/CMakeLists.txt b/python/paddle/fluid/tests/unittests/CMakeLists.txt index b61c7ea04b4e8f88e101f5422f83a2b1d4b1bac1..867d1a6178e1c41a08b54efd6ca7d38a225fef83 100644 --- a/python/paddle/fluid/tests/unittests/CMakeLists.txt +++ b/python/paddle/fluid/tests/unittests/CMakeLists.txt @@ -305,6 +305,8 @@ set_tests_properties(test_parallel_executor_seresnext_base_cpu PROPERTIES TIMEOU set_tests_properties(test_parallel_executor_seresnext_with_reduce_cpu PROPERTIES TIMEOUT 750) set_tests_properties(test_parallel_executor_seresnext_with_fuse_all_reduce_cpu PROPERTIES TIMEOUT 750) +add_subdirectory(sequence) + if (WITH_NGRAPH) add_subdirectory(ngraph) endif() diff --git a/python/paddle/fluid/tests/unittests/sequence/CMakeLists.txt b/python/paddle/fluid/tests/unittests/sequence/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..f71e04c09aa38b8cf7b3a167b84d4dc0e6cc3ec7 --- /dev/null +++ b/python/paddle/fluid/tests/unittests/sequence/CMakeLists.txt @@ -0,0 +1,6 @@ +file(GLOB TEST_OPS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "test_*.py") +string(REPLACE ".py" "" TEST_OPS "${TEST_OPS}") + +foreach(TEST_OP ${TEST_OPS}) + py_test_modules(${TEST_OP} MODULES ${TEST_OP}) +endforeach(TEST_OP) diff --git a/python/paddle/fluid/tests/unittests/sequence/__init__.py b/python/paddle/fluid/tests/unittests/sequence/__init__.py new file mode 100644 index 0000000000000000000000000000000000000000..f106fc5f10398af7c421b6622509c6fd59941e8b --- /dev/null +++ b/python/paddle/fluid/tests/unittests/sequence/__init__.py @@ -0,0 +1,13 @@ +# Copyright (c) 2019 PaddlePaddle Authors. All Rights Reserve. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. diff --git a/python/paddle/fluid/tests/unittests/test_seq_conv.py b/python/paddle/fluid/tests/unittests/sequence/test_seq_conv.py similarity index 99% rename from python/paddle/fluid/tests/unittests/test_seq_conv.py rename to python/paddle/fluid/tests/unittests/sequence/test_seq_conv.py index 84db84977b1bdf10a80b600085674a1d029c6d63..f578f3bdfb301dccc888b83ce63e273353a53773 100644 --- a/python/paddle/fluid/tests/unittests/test_seq_conv.py +++ b/python/paddle/fluid/tests/unittests/sequence/test_seq_conv.py @@ -17,6 +17,8 @@ from __future__ import print_function import unittest import numpy as np import random +import sys +sys.path.append("../") from op_test import OpTest diff --git a/python/paddle/fluid/tests/unittests/test_seq_pool.py b/python/paddle/fluid/tests/unittests/sequence/test_seq_pool.py similarity index 99% rename from python/paddle/fluid/tests/unittests/test_seq_pool.py rename to python/paddle/fluid/tests/unittests/sequence/test_seq_pool.py index 9087b9cc01203d2a20dfbaa211d9d85e1941d89e..94eb091bc010510664ae348c726f3548b2357b75 100644 --- a/python/paddle/fluid/tests/unittests/test_seq_pool.py +++ b/python/paddle/fluid/tests/unittests/sequence/test_seq_pool.py @@ -16,6 +16,8 @@ from __future__ import print_function import unittest import numpy as np +import sys +sys.path.append("../") from op_test import OpTest, skip_check_grad_ci from test_reorder_lod_tensor import convert_to_offset diff --git a/python/paddle/fluid/tests/unittests/test_sequence_concat.py b/python/paddle/fluid/tests/unittests/sequence/test_sequence_concat.py similarity index 98% rename from python/paddle/fluid/tests/unittests/test_sequence_concat.py rename to python/paddle/fluid/tests/unittests/sequence/test_sequence_concat.py index 2dacbb5ae997ffcc0944dc4b88e2a4744b2b1f70..5b3d55c84936ba5ceab89b776b5474653578ab7a 100644 --- a/python/paddle/fluid/tests/unittests/test_sequence_concat.py +++ b/python/paddle/fluid/tests/unittests/sequence/test_sequence_concat.py @@ -16,6 +16,8 @@ from __future__ import print_function import unittest import numpy as np +import sys +sys.path.append("../") from op_test import OpTest diff --git a/python/paddle/fluid/tests/unittests/test_sequence_enumerate_op.py b/python/paddle/fluid/tests/unittests/sequence/test_sequence_enumerate_op.py similarity index 99% rename from python/paddle/fluid/tests/unittests/test_sequence_enumerate_op.py rename to python/paddle/fluid/tests/unittests/sequence/test_sequence_enumerate_op.py index 99bb33a0a5e201c2708855b3af47bdcfd87cd64a..9878e6f74139dcdaa4cc18881306e8cb66e59c6b 100644 --- a/python/paddle/fluid/tests/unittests/test_sequence_enumerate_op.py +++ b/python/paddle/fluid/tests/unittests/sequence/test_sequence_enumerate_op.py @@ -16,6 +16,8 @@ from __future__ import print_function import unittest import numpy as np +import sys +sys.path.append("../") from op_test import OpTest diff --git a/python/paddle/fluid/tests/unittests/test_sequence_erase_op.py b/python/paddle/fluid/tests/unittests/sequence/test_sequence_erase_op.py similarity index 99% rename from python/paddle/fluid/tests/unittests/test_sequence_erase_op.py rename to python/paddle/fluid/tests/unittests/sequence/test_sequence_erase_op.py index 53bb301e9a23de4b7f34db69dd55fa0ce804dae5..9e060201fe8df1ccde8ae47f66f723a7af93ce58 100644 --- a/python/paddle/fluid/tests/unittests/test_sequence_erase_op.py +++ b/python/paddle/fluid/tests/unittests/sequence/test_sequence_erase_op.py @@ -16,6 +16,8 @@ from __future__ import print_function import unittest import numpy as np +import sys +sys.path.append("../") from op_test import OpTest diff --git a/python/paddle/fluid/tests/unittests/test_sequence_expand.py b/python/paddle/fluid/tests/unittests/sequence/test_sequence_expand.py similarity index 99% rename from python/paddle/fluid/tests/unittests/test_sequence_expand.py rename to python/paddle/fluid/tests/unittests/sequence/test_sequence_expand.py index 41d2b8bea49c458081faa359d4cd59b20967b3dc..51e6f31d9cb50ac714a48819253930da1b6421f0 100644 --- a/python/paddle/fluid/tests/unittests/test_sequence_expand.py +++ b/python/paddle/fluid/tests/unittests/sequence/test_sequence_expand.py @@ -16,6 +16,8 @@ from __future__ import print_function import unittest import numpy as np +import sys +sys.path.append("../") from op_test import OpTest diff --git a/python/paddle/fluid/tests/unittests/test_sequence_expand_as.py b/python/paddle/fluid/tests/unittests/sequence/test_sequence_expand_as.py similarity index 98% rename from python/paddle/fluid/tests/unittests/test_sequence_expand_as.py rename to python/paddle/fluid/tests/unittests/sequence/test_sequence_expand_as.py index f3b9f3897c1034a10ff6d53781909160c50fa4a0..f038b00a3bd3dc2ef5823c4f59b68cec05200327 100644 --- a/python/paddle/fluid/tests/unittests/test_sequence_expand_as.py +++ b/python/paddle/fluid/tests/unittests/sequence/test_sequence_expand_as.py @@ -16,6 +16,8 @@ from __future__ import print_function import unittest import numpy as np +import sys +sys.path.append("../") from op_test import OpTest diff --git a/python/paddle/fluid/tests/unittests/test_sequence_mask.py b/python/paddle/fluid/tests/unittests/sequence/test_sequence_mask.py similarity index 99% rename from python/paddle/fluid/tests/unittests/test_sequence_mask.py rename to python/paddle/fluid/tests/unittests/sequence/test_sequence_mask.py index 7e9f4cb5601345d1036959c24222c33efaac9e4f..f1efb78d786d4558f8c8a8d6629650f6d740df18 100644 --- a/python/paddle/fluid/tests/unittests/test_sequence_mask.py +++ b/python/paddle/fluid/tests/unittests/sequence/test_sequence_mask.py @@ -12,13 +12,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -from op_test import OpTest import paddle.fluid as fluid from paddle.fluid.framework import convert_np_dtype_to_dtype_ import paddle.fluid.core as core import numpy as np import copy import unittest +import sys +sys.path.append("../") +from op_test import OpTest class SequenceMaskTestBase(OpTest): diff --git a/python/paddle/fluid/tests/unittests/test_sequence_pad_op.py b/python/paddle/fluid/tests/unittests/sequence/test_sequence_pad_op.py similarity index 99% rename from python/paddle/fluid/tests/unittests/test_sequence_pad_op.py rename to python/paddle/fluid/tests/unittests/sequence/test_sequence_pad_op.py index dfb7b7e774579563723b6b2b1f55e55a4f4b10be..a710fc5ce8b28e869c83c3bc8fe7733e51ae0e59 100644 --- a/python/paddle/fluid/tests/unittests/test_sequence_pad_op.py +++ b/python/paddle/fluid/tests/unittests/sequence/test_sequence_pad_op.py @@ -14,6 +14,8 @@ import unittest import numpy as np +import sys +sys.path.append("../") from op_test import OpTest diff --git a/python/paddle/fluid/tests/unittests/test_sequence_reshape.py b/python/paddle/fluid/tests/unittests/sequence/test_sequence_reshape.py similarity index 98% rename from python/paddle/fluid/tests/unittests/test_sequence_reshape.py rename to python/paddle/fluid/tests/unittests/sequence/test_sequence_reshape.py index c72e5dbaf8052f48e28a6ed04e2f6a09341847e4..4c65cd382ff9a5c41b43c745df62e03bdf44b5e1 100644 --- a/python/paddle/fluid/tests/unittests/test_sequence_reshape.py +++ b/python/paddle/fluid/tests/unittests/sequence/test_sequence_reshape.py @@ -17,6 +17,8 @@ from __future__ import print_function import unittest import numpy as np import math +import sys +sys.path.append("../") from op_test import OpTest diff --git a/python/paddle/fluid/tests/unittests/test_sequence_reverse.py b/python/paddle/fluid/tests/unittests/sequence/test_sequence_reverse.py similarity index 98% rename from python/paddle/fluid/tests/unittests/test_sequence_reverse.py rename to python/paddle/fluid/tests/unittests/sequence/test_sequence_reverse.py index 2b8f9860664f4c87f3459bbce839ffb1c5186ac9..8c7099849153846548b248a0bf9f99c6dd9208ad 100644 --- a/python/paddle/fluid/tests/unittests/test_sequence_reverse.py +++ b/python/paddle/fluid/tests/unittests/sequence/test_sequence_reverse.py @@ -15,8 +15,10 @@ import unittest import paddle.fluid as fluid import paddle.fluid.core as core -from op_test import OpTest import numpy as np +import sys +sys.path.append("../") +from op_test import OpTest class TestSequenceReverseBase(OpTest): diff --git a/python/paddle/fluid/tests/unittests/test_sequence_scatter_op.py b/python/paddle/fluid/tests/unittests/sequence/test_sequence_scatter_op.py similarity index 98% rename from python/paddle/fluid/tests/unittests/test_sequence_scatter_op.py rename to python/paddle/fluid/tests/unittests/sequence/test_sequence_scatter_op.py index 44fece075a40e3dda2bd2ff85f7df1fe20b79560..153efd9182ddd3123d380e7c83b3a588cad8446b 100644 --- a/python/paddle/fluid/tests/unittests/test_sequence_scatter_op.py +++ b/python/paddle/fluid/tests/unittests/sequence/test_sequence_scatter_op.py @@ -14,6 +14,8 @@ import unittest import numpy as np +import sys +sys.path.append("../") from op_test import OpTest diff --git a/python/paddle/fluid/tests/unittests/test_sequence_slice_op.py b/python/paddle/fluid/tests/unittests/sequence/test_sequence_slice_op.py similarity index 99% rename from python/paddle/fluid/tests/unittests/test_sequence_slice_op.py rename to python/paddle/fluid/tests/unittests/sequence/test_sequence_slice_op.py index 9c5492b5b15c1ddbe61e5840b5075ba1c010f0d8..4d254ea6d4f3eff2a637c64abf15a2a8564702c9 100644 --- a/python/paddle/fluid/tests/unittests/test_sequence_slice_op.py +++ b/python/paddle/fluid/tests/unittests/sequence/test_sequence_slice_op.py @@ -17,6 +17,7 @@ from __future__ import print_function import unittest import numpy as np import sys +sys.path.append("../") from op_test import OpTest diff --git a/python/paddle/fluid/tests/unittests/test_sequence_softmax_op.py b/python/paddle/fluid/tests/unittests/sequence/test_sequence_softmax_op.py similarity index 98% rename from python/paddle/fluid/tests/unittests/test_sequence_softmax_op.py rename to python/paddle/fluid/tests/unittests/sequence/test_sequence_softmax_op.py index 0ff8c5330fda65d5a53a8c75a2f2ed23e43b188b..92146820da17243f4345bc3576ee0de79d7b7215 100644 --- a/python/paddle/fluid/tests/unittests/test_sequence_softmax_op.py +++ b/python/paddle/fluid/tests/unittests/sequence/test_sequence_softmax_op.py @@ -16,9 +16,11 @@ from __future__ import print_function import unittest import numpy as np +import paddle.fluid.core as core +import sys +sys.path.append("../") from op_test import OpTest from test_softmax_op import stable_softmax -import paddle.fluid.core as core class TestSequenceSoftmaxOp(OpTest): diff --git a/python/paddle/fluid/tests/unittests/test_sequence_topk_avg_pooling.py b/python/paddle/fluid/tests/unittests/sequence/test_sequence_topk_avg_pooling.py similarity index 99% rename from python/paddle/fluid/tests/unittests/test_sequence_topk_avg_pooling.py rename to python/paddle/fluid/tests/unittests/sequence/test_sequence_topk_avg_pooling.py index 840997d4a19671872e7a6fbd815f7886f6b02097..025455e47be9e95e2eb41c7e582e9c3646dd612e 100644 --- a/python/paddle/fluid/tests/unittests/test_sequence_topk_avg_pooling.py +++ b/python/paddle/fluid/tests/unittests/sequence/test_sequence_topk_avg_pooling.py @@ -16,8 +16,10 @@ from __future__ import print_function import unittest import numpy as np -from op_test import OpTest from copy import deepcopy +import sys +sys.path.append("../") +from op_test import OpTest class TestSequenceTopkAvgPoolingOp(OpTest): diff --git a/python/paddle/fluid/tests/unittests/test_sequence_unpad_op.py b/python/paddle/fluid/tests/unittests/sequence/test_sequence_unpad_op.py similarity index 98% rename from python/paddle/fluid/tests/unittests/test_sequence_unpad_op.py rename to python/paddle/fluid/tests/unittests/sequence/test_sequence_unpad_op.py index 3905d7bf3cf005e51cf0d0a215550e8a09517118..a37f7b58ee50ff08e93f1a7a3ddc8f1fbf0ac6c0 100644 --- a/python/paddle/fluid/tests/unittests/test_sequence_unpad_op.py +++ b/python/paddle/fluid/tests/unittests/sequence/test_sequence_unpad_op.py @@ -15,6 +15,8 @@ import unittest import six import numpy as np +import sys +sys.path.append("../") from op_test import OpTest diff --git a/python/paddle/fluid/tests/unittests/test_fusion_seqconv_eltadd_relu_op.py b/python/paddle/fluid/tests/unittests/test_fusion_seqconv_eltadd_relu_op.py index ba6f1415b1c832eb688443953866652e3458b172..bd5e1895aa6efc4c8053769f07b7db5109ec1c0c 100644 --- a/python/paddle/fluid/tests/unittests/test_fusion_seqconv_eltadd_relu_op.py +++ b/python/paddle/fluid/tests/unittests/test_fusion_seqconv_eltadd_relu_op.py @@ -18,7 +18,7 @@ import unittest import numpy as np import random from op_test import OpTest -from test_seq_conv import seqconv +from sequence.test_seq_conv import seqconv class TestSeqConvEltAddRelu(OpTest): diff --git a/python/paddle/fluid/tests/unittests/test_fusion_seqpool_concat_op.py b/python/paddle/fluid/tests/unittests/test_fusion_seqpool_concat_op.py index 8a6837dae2c800ba7059f77978aa7bd3c2f50136..d8054a85cb60768837077c56f8425321c190d6f1 100644 --- a/python/paddle/fluid/tests/unittests/test_fusion_seqpool_concat_op.py +++ b/python/paddle/fluid/tests/unittests/test_fusion_seqpool_concat_op.py @@ -18,7 +18,7 @@ import unittest import numpy as np from op_test import OpTest from test_reorder_lod_tensor import convert_to_offset -from test_seq_pool import compute_seqpool_sum, compute_seqpool_avg, compute_seqpool_sqrt +from sequence.test_seq_pool import compute_seqpool_sum, compute_seqpool_avg, compute_seqpool_sqrt class TestFusionSeqPoolConcatOp(OpTest): diff --git a/python/paddle/fluid/tests/unittests/test_fusion_seqpool_cvm_concat_op.py b/python/paddle/fluid/tests/unittests/test_fusion_seqpool_cvm_concat_op.py index 332f48ae71a9cc7b64d6aa7641c1ef8db63bc3a4..a4dd2659dcb5617bad79a765206c4b74e2b16b21 100644 --- a/python/paddle/fluid/tests/unittests/test_fusion_seqpool_cvm_concat_op.py +++ b/python/paddle/fluid/tests/unittests/test_fusion_seqpool_cvm_concat_op.py @@ -18,7 +18,7 @@ import unittest import numpy as np from op_test import OpTest from test_reorder_lod_tensor import convert_to_offset -from test_seq_pool import compute_seqpool_sum, compute_seqpool_avg, compute_seqpool_sqrt +from sequence.test_seq_pool import compute_seqpool_sum, compute_seqpool_avg, compute_seqpool_sqrt from test_cvm_op import cvm_compute