diff --git a/acl/CMakeLists.txt b/acl/CMakeLists.txt index dc33fbf..86a30c1 100644 --- a/acl/CMakeLists.txt +++ b/acl/CMakeLists.txt @@ -1,15 +1,6 @@ -#if(NOT HAVE_ACL) -# ocv_module_disable(acl) -# return() -#endif() - -#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" "-DENABLE_DVPP_INTERFACE") - -set(acl_lib "/usr/local/Ascend/ascend-toolkit/latest/acllib/lib64/stub/") set(acl_lib "/usr/local/Ascend/ascend-toolkit/latest/fwkacllib/lib64/stub/") link_directories(${acl_lib}) -set(acl_inc "/usr/local/Ascend/ascend-toolkit/latest/acllib/include/") set(acl_inc "/usr/local/Ascend/ascend-toolkit/latest/fwkacllib/include/") ocv_include_directories(${acl_inc}) diff --git a/acl/test/acl.cpp b/acl/test/acl.cpp index 51f4b4a..e5c8600 100644 --- a/acl/test/acl.cpp +++ b/acl/test/acl.cpp @@ -7,7 +7,6 @@ namespace opencv_test { namespace { -#if 0 aclCxt *acl_context_0 = set_device("../../modules/acl/test/acl.json", 0, 2); ////////////////////////////////////////////////////Correctness_test//////////////////////////////////////////////////////// @@ -302,8 +301,8 @@ namespace opencv_test test.Test_Flip(acl_context_0); release_device(acl_context_0); } -#endif +#ifdef DEBUG TEST(Test, other) { aclCxt *acl_context_0 = set_device("../../modules/acl/test/acl.json", 0, 2); @@ -325,5 +324,6 @@ namespace opencv_test PERF_TEST test; test.Test_other2(); } +#endif } } \ No newline at end of file