From 68e778bed0f05d14ecd7ec4484a07e62781f00f5 Mon Sep 17 00:00:00 2001 From: brian Date: Tue, 29 Aug 2023 15:18:45 +0200 Subject: [PATCH] Reorganising build.gradle for CUDA 12 Signed-off-by: brian --- .../ai/nd4j/tests/LoadBackendTests.java | 2 +- cavis-native/cavis-native-lib/CMakeLists.txt | 6 +++-- cavis-native/cavis-native-lib/build.gradle | 3 ++- .../src/main/cpp/blas/CMakeLists.txt | 25 +++--------------- .../test/{ => cpp}/tests_cpu/CMakeLists.txt | 0 .../{ => cpp}/tests_cpu/CMakeLists.txt.in | 0 .../tests_cpu/layers_tests/AllTests.cpp | 0 .../layers_tests/ArrayOptionsTests.cpp | 0 .../tests_cpu/layers_tests/AtomicTests.cu | 0 .../tests_cpu/layers_tests/AttentionTests.cpp | 0 .../tests_cpu/layers_tests/BackpropTests.cpp | 0 .../layers_tests/BitwiseUtilsTests.cpp | 0 .../layers_tests/BooleanOpsTests.cpp | 0 .../layers_tests/BroadcastableOpsTests.cpp | 0 .../tests_cpu/layers_tests/BrodcastTests.cpp | 0 .../tests_cpu/layers_tests/CMakeLists.txt | 21 ++++++++------- .../tests_cpu/layers_tests/CnpyTests.cpp | 0 .../layers_tests/ConditionalTests.cpp | 0 .../layers_tests/ConstantShapeHelperTests.cpp | 0 .../tests_cpu/layers_tests/ContextTests.cpp | 0 .../layers_tests/ConvolutionTests1.cpp | 0 .../layers_tests/ConvolutionTests2.cpp | 0 .../tests_cpu/layers_tests/CuDnnTests.cu | 0 .../layers_tests/CudaBasicsTests1.cu | 0 .../layers_tests/CudaBasicsTests2.cu | 0 .../layers_tests/CudaExtraArgumentsTests.cu | 0 .../layers_tests/CudaLaunchHelperTests.cpp | 0 .../layers_tests/DataBufferTests.cpp | 0 .../layers_tests/DataBufferTestsCuda.cu | 0 .../layers_tests/DataTypesValidationTests.cpp | 0 .../layers_tests/DeclarableOpsTests1.cpp | 0 .../layers_tests/DeclarableOpsTests10.cpp | 0 .../layers_tests/DeclarableOpsTests11.cpp | 0 .../layers_tests/DeclarableOpsTests12.cpp | 0 .../layers_tests/DeclarableOpsTests13.cpp | 0 .../layers_tests/DeclarableOpsTests14.cpp | 0 .../layers_tests/DeclarableOpsTests15.cpp | 0 .../layers_tests/DeclarableOpsTests16.cpp | 0 .../layers_tests/DeclarableOpsTests17.cpp | 0 .../layers_tests/DeclarableOpsTests18.cpp | 0 .../layers_tests/DeclarableOpsTests19.cpp | 0 .../layers_tests/DeclarableOpsTests2.cpp | 0 .../layers_tests/DeclarableOpsTests3.cpp | 0 .../layers_tests/DeclarableOpsTests4.cpp | 0 .../layers_tests/DeclarableOpsTests5.cpp | 0 .../layers_tests/DeclarableOpsTests6.cpp | 0 .../layers_tests/DeclarableOpsTests7.cpp | 0 .../layers_tests/DeclarableOpsTests8.cpp | 0 .../layers_tests/DeclarableOpsTests9.cpp | 0 .../layers_tests/DeclarableOpsTestsCuda1.cu | 0 .../tests_cpu/layers_tests/EmptyTests.cpp | 0 .../layers_tests/ExtraArgumentsTests.cpp | 0 .../layers_tests/FlatBuffersTests.cpp | 0 .../tests_cpu/layers_tests/FlatUtilsTests.cpp | 0 .../layers_tests/GraphExecutionerTests.cpp | 0 .../layers_tests/GraphHolderTests.cpp | 0 .../GraphRandomGeneratorTests.cpp | 0 .../layers_tests/GraphStateTests.cpp | 0 .../tests_cpu/layers_tests/GraphTests.cpp | 0 .../tests_cpu/layers_tests/HashUtilsTests.cpp | 0 .../tests_cpu/layers_tests/HelpersTests1.cpp | 0 .../tests_cpu/layers_tests/HelpersTests2.cpp | 0 .../tests_cpu/layers_tests/IndexingTests.cpp | 0 .../layers_tests/JavaInteropCudaTests.cu | 0 .../layers_tests/JavaInteropTests.cpp | 0 .../tests_cpu/layers_tests/LambdaTests.cu | 0 .../layers_tests/LaunchContextCudaTests.cu | 0 .../layers_tests/LegacyOpsCudaTests.cu | 0 .../tests_cpu/layers_tests/LegacyOpsTests.cpp | 0 .../layers_tests/ListOperationsTests.cpp | 0 .../layers_tests/LoopCoordsHelperTests.cpp | 0 .../layers_tests/MemoryUtilsTests.cpp | 0 .../tests_cpu/layers_tests/MklDnnTests.cpp | 0 .../tests_cpu/layers_tests/MmapTests.cpp | 0 .../layers_tests/MultiDataTypeTests.cpp | 0 .../layers_tests/MultiDeviceTests.cpp | 0 .../layers_tests/NDArrayConstructorsTests.cu | 0 .../layers_tests/NDArrayCudaBasicsTests.cu | 0 .../layers_tests/NDArrayListTests.cpp | 0 .../tests_cpu/layers_tests/NDArrayTests.cpp | 0 .../tests_cpu/layers_tests/NDArrayTests2.cpp | 0 .../tests_cpu/layers_tests/NativeOpsTests.cpp | 0 .../tests_cpu/layers_tests/NlpTests.cpp | 0 .../tests_cpu/layers_tests/NodeTests.cpp | 0 .../layers_tests/OmpLaunchHelperTests.cpp | 0 .../tests_cpu/layers_tests/OneOffTests.cpp | 0 .../tests_cpu/layers_tests/OpTrackerTests.cpp | 0 .../tests_cpu/layers_tests/OpTupleTests.cpp | 0 .../tests_cpu/layers_tests/PairwiseTests.cpp | 0 .../tests_cpu/layers_tests/ParityOpsTests.cpp | 0 .../layers_tests/PerformanceTests.cpp | 0 .../layers_tests/PlaygroundTests.cpp | 0 .../layers_tests/PrimitivesTests.cpp | 0 .../tests_cpu/layers_tests/ProtoBufTests.cpp | 0 .../layers_tests/QuantizationTests.cpp | 0 .../tests_cpu/layers_tests/RNGTests.cpp | 0 .../tests_cpu/layers_tests/ResultSetTests.cpp | 0 .../tests_cpu/layers_tests/SanityTests.cpp | 0 .../tests_cpu/layers_tests/ScalarTests.cpp | 0 .../tests_cpu/layers_tests/ScopeTests.cpp | 0 .../layers_tests/ServerRelatedTests.cpp | 0 .../tests_cpu/layers_tests/ShapeTests.cpp | 0 .../tests_cpu/layers_tests/ShapeTests2.cpp | 0 .../layers_tests/ShapeUtilsTests.cpp | 0 .../tests_cpu/layers_tests/SingleDimTests.cpp | 0 .../tests_cpu/layers_tests/SortCpuTests.cpp | 0 .../tests_cpu/layers_tests/SortCudaTests.cu | 0 .../layers_tests/SparseUtilsTest.cpp | 0 .../tests_cpu/layers_tests/StashTests.cpp | 0 .../tests_cpu/layers_tests/StringTests.cpp | 0 .../tests_cpu/layers_tests/SwitchTests.cpp | 0 .../tests_cpu/layers_tests/TadTests.cpp | 0 .../tests_cpu/layers_tests/ThreadsTests.cpp | 0 .../tests_cpu/layers_tests/TypeCastTests.cpp | 0 .../layers_tests/VariableProxyTests.cpp | 0 .../layers_tests/VariableSpaceTests.cpp | 0 .../tests_cpu/layers_tests/VariableTests.cpp | 0 .../tests_cpu/layers_tests/WorkspaceTests.cpp | 0 .../tests_cpu/layers_tests/WorkspaceTests.cu | 0 .../tests_cpu/layers_tests/suppressions.txt | 0 .../tests_cpu/layers_tests/testinclude.h | 0 .../tests_cpu/layers_tests/testlayers.h | 0 .../tests_cpu/libnd4j_tests/CMakeLists.txt | 0 .../tests_cpu/resources/arr_3,4_float32.npy | Bin .../resources/assert_type_rank2_int64.fb | Bin .../tests_cpu/resources/assertsomething.fb | Bin .../tests_cpu/resources/avg_pooling3d.fb | Bin .../channels_last_b1_k2_s1_d1_SAME_crelu.fb | Bin .../tests_cpu/resources/cond_true.fb | Bin .../tests_cpu/resources/identity_n_2.fb | Bin .../{ => cpp}/tests_cpu/resources/non2d_0A.fb | Bin .../{ => cpp}/tests_cpu/resources/non2d_1.fb | Bin .../{ => cpp}/tests_cpu/resources/pad_1D.fb | Bin .../resources/reduce_all_rank2_d0_keep.fb | Bin .../tests_cpu/resources/scalar_float32.fb | Bin .../tests_cpu/resources/scatter_nd_update.fb | Bin .../tests_cpu/resources/simpleif_0_alt.fb | Bin .../tests_cpu/resources/simplewhile_1.fb | Bin .../tests_cpu/resources/simplewhile_nested.fb | Bin ...se_sz1_float32_nodynamic_noname_noshape.fb | Bin ...it_sz1_float32_nodynamic_noname_noshape.fb | Bin ...ay_stack_sz3-1_int32_dynamic_name_shape.fb | Bin ...ack_sz1_int64_nodynamic_noname_shape2-3.fb | Bin .../tests_cpu/resources/while_iter3.fb | Bin .../test/{ => cpp}/tests_cpu/run_minifier.sh | 0 .../src/test/{ => cpp}/tests_cpu/run_tests.sh | 0 146 files changed, 22 insertions(+), 35 deletions(-) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/CMakeLists.txt (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/CMakeLists.txt.in (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/AllTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/ArrayOptionsTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/AtomicTests.cu (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/AttentionTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/BackpropTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/BitwiseUtilsTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/BooleanOpsTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/BroadcastableOpsTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/BrodcastTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/CMakeLists.txt (91%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/CnpyTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/ConditionalTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/ConstantShapeHelperTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/ContextTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/ConvolutionTests1.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/ConvolutionTests2.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/CuDnnTests.cu (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/CudaBasicsTests1.cu (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/CudaBasicsTests2.cu (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/CudaExtraArgumentsTests.cu (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/CudaLaunchHelperTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/DataBufferTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/DataBufferTestsCuda.cu (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/DataTypesValidationTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/DeclarableOpsTests1.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/DeclarableOpsTests10.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/DeclarableOpsTests11.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/DeclarableOpsTests12.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/DeclarableOpsTests13.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/DeclarableOpsTests14.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/DeclarableOpsTests15.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/DeclarableOpsTests16.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/DeclarableOpsTests17.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/DeclarableOpsTests18.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/DeclarableOpsTests19.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/DeclarableOpsTests2.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/DeclarableOpsTests3.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/DeclarableOpsTests4.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/DeclarableOpsTests5.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/DeclarableOpsTests6.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/DeclarableOpsTests7.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/DeclarableOpsTests8.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/DeclarableOpsTests9.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/DeclarableOpsTestsCuda1.cu (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/EmptyTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/ExtraArgumentsTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/FlatBuffersTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/FlatUtilsTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/GraphExecutionerTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/GraphHolderTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/GraphRandomGeneratorTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/GraphStateTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/GraphTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/HashUtilsTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/HelpersTests1.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/HelpersTests2.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/IndexingTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/JavaInteropCudaTests.cu (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/JavaInteropTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/LambdaTests.cu (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/LaunchContextCudaTests.cu (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/LegacyOpsCudaTests.cu (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/LegacyOpsTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/ListOperationsTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/LoopCoordsHelperTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/MemoryUtilsTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/MklDnnTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/MmapTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/MultiDataTypeTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/MultiDeviceTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/NDArrayConstructorsTests.cu (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/NDArrayCudaBasicsTests.cu (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/NDArrayListTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/NDArrayTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/NDArrayTests2.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/NativeOpsTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/NlpTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/NodeTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/OmpLaunchHelperTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/OneOffTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/OpTrackerTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/OpTupleTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/PairwiseTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/ParityOpsTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/PerformanceTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/PlaygroundTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/PrimitivesTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/ProtoBufTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/QuantizationTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/RNGTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/ResultSetTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/SanityTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/ScalarTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/ScopeTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/ServerRelatedTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/ShapeTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/ShapeTests2.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/ShapeUtilsTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/SingleDimTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/SortCpuTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/SortCudaTests.cu (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/SparseUtilsTest.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/StashTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/StringTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/SwitchTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/TadTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/ThreadsTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/TypeCastTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/VariableProxyTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/VariableSpaceTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/VariableTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/WorkspaceTests.cpp (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/WorkspaceTests.cu (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/suppressions.txt (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/testinclude.h (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/layers_tests/testlayers.h (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/libnd4j_tests/CMakeLists.txt (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/resources/arr_3,4_float32.npy (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/resources/assert_type_rank2_int64.fb (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/resources/assertsomething.fb (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/resources/avg_pooling3d.fb (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/resources/channels_last_b1_k2_s1_d1_SAME_crelu.fb (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/resources/cond_true.fb (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/resources/identity_n_2.fb (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/resources/non2d_0A.fb (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/resources/non2d_1.fb (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/resources/pad_1D.fb (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/resources/reduce_all_rank2_d0_keep.fb (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/resources/scalar_float32.fb (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/resources/scatter_nd_update.fb (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/resources/simpleif_0_alt.fb (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/resources/simplewhile_1.fb (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/resources/simplewhile_nested.fb (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/resources/tensor_array_close_sz1_float32_nodynamic_noname_noshape.fb (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/resources/tensor_array_split_sz1_float32_nodynamic_noname_noshape.fb (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/resources/tensor_array_stack_sz3-1_int32_dynamic_name_shape.fb (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/resources/tensor_array_unstack_sz1_int64_nodynamic_noname_shape2-3.fb (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/resources/while_iter3.fb (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/run_minifier.sh (100%) rename cavis-native/cavis-native-lib/src/test/{ => cpp}/tests_cpu/run_tests.sh (100%) diff --git a/brutex-extended-tests/src/test/java/net/brutex/ai/nd4j/tests/LoadBackendTests.java b/brutex-extended-tests/src/test/java/net/brutex/ai/nd4j/tests/LoadBackendTests.java index bb03a4fb9..c242f6a55 100644 --- a/brutex-extended-tests/src/test/java/net/brutex/ai/nd4j/tests/LoadBackendTests.java +++ b/brutex-extended-tests/src/test/java/net/brutex/ai/nd4j/tests/LoadBackendTests.java @@ -53,6 +53,6 @@ public class LoadBackendTests { @Test public void loadCudaDLL() { System.load( - "C:\\Users\\brian\\_projects\\deeplearning4j\\cavis-native\\cavis-native-lib\\build\\generated\\sources\\javacpp\\cuda\\windows-x86_64-avx2\\jni_nd4jcuda.dll"); + "C:\\Users\\brian\\_projects\\deeplearning4j\\cavis-native\\cavis-native-lib\\build\\generated\\sources\\javacpp\\cuda\\windows-x86_64-avx2\\jnind4jcuda.dll"); } } diff --git a/cavis-native/cavis-native-lib/CMakeLists.txt b/cavis-native/cavis-native-lib/CMakeLists.txt index 271c5f3bd..a951d2be2 100644 --- a/cavis-native/cavis-native-lib/CMakeLists.txt +++ b/cavis-native/cavis-native-lib/CMakeLists.txt @@ -24,7 +24,9 @@ option(FLATBUFFERS_BUILD_FLATC "Enable the build of the flatbuffers compiler" OF set(FLATBUFFERS_BUILD_FLATC "OFF" CACHE STRING "Hack to disable flatc build" FORCE) set(CMAKE_CXX_STANDARD 14) -set(THREADS_PREFER_PTHREAD_FLAG ON) + +set(CMAKE_THREAD_PREFER_PTHREAD TRUE) +set(THREADS_PREFER_PTHREAD_FLAG TRUE) find_package(Threads REQUIRED) #/////////////////////////////////////////////////////////////////////////////// @@ -364,7 +366,7 @@ if(SD_BUILD_TESTS) # tests are always compiled with all ops included set(SD_ALL_OPS true) set(SD_BUILD_MINIFIER true) - add_subdirectory(tests_cpu) + add_subdirectory(src/test/cpp/tests_cpu) endif() diff --git a/cavis-native/cavis-native-lib/build.gradle b/cavis-native/cavis-native-lib/build.gradle index f46adb586..dcbabf612 100644 --- a/cavis-native/cavis-native-lib/build.gradle +++ b/cavis-native/cavis-native-lib/build.gradle @@ -251,7 +251,8 @@ chipList.each { String thisChip -> '--chip-extension', avxExtension, '-j', "${host_cores}", // '--helper', 'mkldnn', - '--helper', 'cudnn'] + '--helper', 'cudnn', + '--tests'] } else if (thisChip.equals('cuda') && osdetector.os.startsWith("linux")) { //cuDNN requires CUDA it.buildCommand = ['bash', 'buildnativeoperations.sh', '-V', diff --git a/cavis-native/cavis-native-lib/src/main/cpp/blas/CMakeLists.txt b/cavis-native/cavis-native-lib/src/main/cpp/blas/CMakeLists.txt index 9df87de12..e37b2a5ef 100644 --- a/cavis-native/cavis-native-lib/src/main/cpp/blas/CMakeLists.txt +++ b/cavis-native/cavis-native-lib/src/main/cpp/blas/CMakeLists.txt @@ -216,32 +216,15 @@ if(SD_CUDA) endif() endif() -# - #string( TOLOWER "${COMPUTE}" COMPUTE_CMP ) -# if ("${COMPUTE_CMP}" STREQUAL "all") -# CUDA_SELECT_NVCC_ARCH_FLAGS(CUDA_ARCH_FLAGS "Common") -# elseif("${COMPUTE_CMP}" STREQUAL "auto") -# CUDA_SELECT_NVCC_ARCH_FLAGS(CUDA_ARCH_FLAGS "Auto") -# elseif(COMPUTE_CMP MATCHES "^[0-9]+$") -# #matches USER COMPUTE old way - #set(CUDA_ARCH_FLAGS "-gencode arch=compute_${COMPUTE},code=sm_${COMPUTE} ") -# else() -# #matches numbers NAME | NUM.NUM | NUM.NUM(NUM.NUM) | NUM.NUM+PTX -# #NAME: Fermi Kepler Maxwell Kepler+Tegra Kepler+Tesla Maxwell+Tegra Pascal -# #NUM: 2.0 2.1 3.0 3.2 3.5 3.7 5.0 5.2 5.3 6.0 6.2 et cetera -# CUDA_SELECT_NVCC_ARCH_FLAGS(CUDA_ARCH_FLAGS "${COMPUTE}") -# endif() - # list to spaces - #string (REPLACE ";" " " CUDA_ARCH_FLAGS "${CUDA_ARCH_FLAGS}") - #set(CMAKE_CUDA_FLAGS " ${CMAKE_CUDA_FLAGS} -DCUDA_VERSION_MAJOR=${CUDA_VERSION_MAJOR} ${EXPM} -w --cudart=static --expt-extended-lambda -Xfatbin -compress-all ") - set(CMAKE_CUDA_ARCHITECTURES OFF) + set(CMAKE_CUDA_ARCHITECTURES "all-major") + set(CMAKE_CUDA_RUNTIME_LIBRARY "shared") #set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} --generate-code \"arch=compute_53,code=[compute_53,sm_53]\" " ) - set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} --generate-code \"arch=compute_61,code=[compute_61,sm_61]\" " ) + #set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} --generate-code \"arch=compute_61,code=[compute_61,sm_61]\" " ) #set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} --generate-code \"arch=compute_75,code=[compute_75,sm_75]\" " ) set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} --extended-lambda ") set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} --expt-relaxed-constexpr ") - set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} -DCUDA_VERSION_MAJOR=12 -w --cudart=static -Xfatbin -compress-all") + set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} -DCUDA_VERSION_MAJOR=12 -w -Xfatbin -compress-all") set(CUDAHOSTCXX "${CMAKE_CXX_COMPILER}") if(WIN32) set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} -Xcompiler=/EHsc") diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/CMakeLists.txt b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/CMakeLists.txt similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/CMakeLists.txt rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/CMakeLists.txt diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/CMakeLists.txt.in b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/CMakeLists.txt.in similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/CMakeLists.txt.in rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/CMakeLists.txt.in diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/AllTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/AllTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/AllTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/AllTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/ArrayOptionsTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/ArrayOptionsTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/ArrayOptionsTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/ArrayOptionsTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/AtomicTests.cu b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/AtomicTests.cu similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/AtomicTests.cu rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/AtomicTests.cu diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/AttentionTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/AttentionTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/AttentionTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/AttentionTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/BackpropTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/BackpropTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/BackpropTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/BackpropTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/BitwiseUtilsTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/BitwiseUtilsTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/BitwiseUtilsTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/BitwiseUtilsTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/BooleanOpsTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/BooleanOpsTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/BooleanOpsTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/BooleanOpsTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/BroadcastableOpsTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/BroadcastableOpsTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/BroadcastableOpsTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/BroadcastableOpsTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/BrodcastTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/BrodcastTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/BrodcastTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/BrodcastTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/CMakeLists.txt b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/CMakeLists.txt similarity index 91% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/CMakeLists.txt rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/CMakeLists.txt index ac8578af0..fd8a70f9e 100644 --- a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/CMakeLists.txt +++ b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/CMakeLists.txt @@ -1,5 +1,5 @@ include_directories(${gtest_SOURCE_DIR}/include ${gtest_SOURCE_DIR}) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) +include_directories(../../../../../src/main/cpp/blas) if(LINUX) link_directories(/usr/local/lib) link_directories(/usr/lib) @@ -22,9 +22,13 @@ if(WIN32) endif() if (SD_CUDA) - find_package(CUDA) - message("Tests CUDA include directory: ${CUDA_INCLUDE_DIRS}") - include_directories(${CUDA_INCLUDE_DIRS}) + find_package(CUDAToolkit 12.2 REQUIRED) + enable_language(CUDA) + + set(CMAKE_CUDA_STANDARD 17) + set(CMAKE_CXX_STANDARD 14) + message("Tests CUDA include directory: ${CUDAToolkit_INCLUDE_DIRS}") + include_directories(${CUDAToolkit_INCLUDE_DIRS}) add_definitions(-D__CUDABLAS__=true) if(WIN32) @@ -34,17 +38,14 @@ if (SD_CUDA) string( TOLOWER "${COMPUTE}" COMPUTE_CMP ) if ("${COMPUTE_CMP}" STREQUAL "all") - CUDA_SELECT_NVCC_ARCH_FLAGS(CUDA_ARCH_FLAGS "Common") + set(CMAKE_CUDA_ARCHITECTURES "all") elseif("${COMPUTE_CMP}" STREQUAL "auto") - CUDA_SELECT_NVCC_ARCH_FLAGS(CUDA_ARCH_FLAGS "Auto") - elseif(COMPUTE_CMP MATCHES "^[0-9]+$") - #matches USER COMPUTE old way - set(CUDA_ARCH_FLAGS "-gencode arch=compute_${COMPUTE},code=sm_${COMPUTE} ") + set(CMAKE_CUDA_ARCHITECTURES "all-major") else() #matches numbers NAME | NUM.NUM | NUM.NUM(NUM.NUM) | NUM.NUM+PTX #NAME: Fermi Kepler Maxwell Kepler+Tegra Kepler+Tesla Maxwell+Tegra Pascal #NUM: 2.0 2.1 3.0 3.2 3.5 3.7 5.0 5.2 5.3 6.0 6.2 et cetera - CUDA_SELECT_NVCC_ARCH_FLAGS(CUDA_ARCH_FLAGS "${COMPUTE}") + set(CMAKE_CUDA_ARCHITECTURES "all") endif() # list to spaces string (REPLACE ";" " " CUDA_ARCH_FLAGS "${CUDA_ARCH_FLAGS}") diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/CnpyTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/CnpyTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/CnpyTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/CnpyTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/ConditionalTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/ConditionalTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/ConditionalTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/ConditionalTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/ConstantShapeHelperTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/ConstantShapeHelperTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/ConstantShapeHelperTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/ConstantShapeHelperTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/ContextTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/ContextTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/ContextTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/ContextTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/ConvolutionTests1.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/ConvolutionTests1.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/ConvolutionTests1.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/ConvolutionTests1.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/ConvolutionTests2.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/ConvolutionTests2.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/ConvolutionTests2.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/ConvolutionTests2.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/CuDnnTests.cu b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/CuDnnTests.cu similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/CuDnnTests.cu rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/CuDnnTests.cu diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/CudaBasicsTests1.cu b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/CudaBasicsTests1.cu similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/CudaBasicsTests1.cu rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/CudaBasicsTests1.cu diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/CudaBasicsTests2.cu b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/CudaBasicsTests2.cu similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/CudaBasicsTests2.cu rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/CudaBasicsTests2.cu diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/CudaExtraArgumentsTests.cu b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/CudaExtraArgumentsTests.cu similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/CudaExtraArgumentsTests.cu rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/CudaExtraArgumentsTests.cu diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/CudaLaunchHelperTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/CudaLaunchHelperTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/CudaLaunchHelperTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/CudaLaunchHelperTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/DataBufferTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/DataBufferTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/DataBufferTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/DataBufferTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/DataBufferTestsCuda.cu b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/DataBufferTestsCuda.cu similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/DataBufferTestsCuda.cu rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/DataBufferTestsCuda.cu diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/DataTypesValidationTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/DataTypesValidationTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/DataTypesValidationTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/DataTypesValidationTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/DeclarableOpsTests1.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/DeclarableOpsTests1.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/DeclarableOpsTests1.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/DeclarableOpsTests1.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/DeclarableOpsTests10.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/DeclarableOpsTests10.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/DeclarableOpsTests10.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/DeclarableOpsTests10.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/DeclarableOpsTests11.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/DeclarableOpsTests11.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/DeclarableOpsTests11.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/DeclarableOpsTests11.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/DeclarableOpsTests12.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/DeclarableOpsTests12.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/DeclarableOpsTests12.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/DeclarableOpsTests12.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/DeclarableOpsTests13.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/DeclarableOpsTests13.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/DeclarableOpsTests13.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/DeclarableOpsTests13.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/DeclarableOpsTests14.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/DeclarableOpsTests14.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/DeclarableOpsTests14.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/DeclarableOpsTests14.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/DeclarableOpsTests15.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/DeclarableOpsTests15.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/DeclarableOpsTests15.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/DeclarableOpsTests15.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/DeclarableOpsTests16.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/DeclarableOpsTests16.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/DeclarableOpsTests16.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/DeclarableOpsTests16.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/DeclarableOpsTests17.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/DeclarableOpsTests17.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/DeclarableOpsTests17.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/DeclarableOpsTests17.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/DeclarableOpsTests18.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/DeclarableOpsTests18.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/DeclarableOpsTests18.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/DeclarableOpsTests18.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/DeclarableOpsTests19.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/DeclarableOpsTests19.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/DeclarableOpsTests19.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/DeclarableOpsTests19.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/DeclarableOpsTests2.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/DeclarableOpsTests2.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/DeclarableOpsTests2.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/DeclarableOpsTests2.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/DeclarableOpsTests3.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/DeclarableOpsTests3.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/DeclarableOpsTests3.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/DeclarableOpsTests3.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/DeclarableOpsTests4.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/DeclarableOpsTests4.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/DeclarableOpsTests4.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/DeclarableOpsTests4.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/DeclarableOpsTests5.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/DeclarableOpsTests5.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/DeclarableOpsTests5.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/DeclarableOpsTests5.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/DeclarableOpsTests6.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/DeclarableOpsTests6.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/DeclarableOpsTests6.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/DeclarableOpsTests6.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/DeclarableOpsTests7.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/DeclarableOpsTests7.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/DeclarableOpsTests7.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/DeclarableOpsTests7.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/DeclarableOpsTests8.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/DeclarableOpsTests8.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/DeclarableOpsTests8.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/DeclarableOpsTests8.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/DeclarableOpsTests9.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/DeclarableOpsTests9.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/DeclarableOpsTests9.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/DeclarableOpsTests9.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/DeclarableOpsTestsCuda1.cu b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/DeclarableOpsTestsCuda1.cu similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/DeclarableOpsTestsCuda1.cu rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/DeclarableOpsTestsCuda1.cu diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/EmptyTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/EmptyTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/EmptyTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/EmptyTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/ExtraArgumentsTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/ExtraArgumentsTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/ExtraArgumentsTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/ExtraArgumentsTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/FlatBuffersTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/FlatBuffersTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/FlatBuffersTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/FlatBuffersTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/FlatUtilsTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/FlatUtilsTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/FlatUtilsTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/FlatUtilsTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/GraphExecutionerTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/GraphExecutionerTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/GraphExecutionerTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/GraphExecutionerTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/GraphHolderTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/GraphHolderTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/GraphHolderTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/GraphHolderTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/GraphRandomGeneratorTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/GraphRandomGeneratorTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/GraphRandomGeneratorTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/GraphRandomGeneratorTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/GraphStateTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/GraphStateTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/GraphStateTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/GraphStateTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/GraphTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/GraphTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/GraphTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/GraphTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/HashUtilsTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/HashUtilsTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/HashUtilsTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/HashUtilsTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/HelpersTests1.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/HelpersTests1.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/HelpersTests1.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/HelpersTests1.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/HelpersTests2.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/HelpersTests2.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/HelpersTests2.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/HelpersTests2.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/IndexingTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/IndexingTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/IndexingTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/IndexingTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/JavaInteropCudaTests.cu b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/JavaInteropCudaTests.cu similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/JavaInteropCudaTests.cu rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/JavaInteropCudaTests.cu diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/JavaInteropTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/JavaInteropTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/JavaInteropTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/JavaInteropTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/LambdaTests.cu b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/LambdaTests.cu similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/LambdaTests.cu rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/LambdaTests.cu diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/LaunchContextCudaTests.cu b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/LaunchContextCudaTests.cu similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/LaunchContextCudaTests.cu rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/LaunchContextCudaTests.cu diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/LegacyOpsCudaTests.cu b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/LegacyOpsCudaTests.cu similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/LegacyOpsCudaTests.cu rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/LegacyOpsCudaTests.cu diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/LegacyOpsTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/LegacyOpsTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/LegacyOpsTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/LegacyOpsTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/ListOperationsTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/ListOperationsTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/ListOperationsTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/ListOperationsTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/LoopCoordsHelperTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/LoopCoordsHelperTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/LoopCoordsHelperTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/LoopCoordsHelperTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/MemoryUtilsTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/MemoryUtilsTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/MemoryUtilsTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/MemoryUtilsTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/MklDnnTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/MklDnnTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/MklDnnTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/MklDnnTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/MmapTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/MmapTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/MmapTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/MmapTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/MultiDataTypeTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/MultiDataTypeTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/MultiDataTypeTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/MultiDataTypeTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/MultiDeviceTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/MultiDeviceTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/MultiDeviceTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/MultiDeviceTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/NDArrayConstructorsTests.cu b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/NDArrayConstructorsTests.cu similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/NDArrayConstructorsTests.cu rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/NDArrayConstructorsTests.cu diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/NDArrayCudaBasicsTests.cu b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/NDArrayCudaBasicsTests.cu similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/NDArrayCudaBasicsTests.cu rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/NDArrayCudaBasicsTests.cu diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/NDArrayListTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/NDArrayListTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/NDArrayListTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/NDArrayListTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/NDArrayTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/NDArrayTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/NDArrayTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/NDArrayTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/NDArrayTests2.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/NDArrayTests2.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/NDArrayTests2.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/NDArrayTests2.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/NativeOpsTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/NativeOpsTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/NativeOpsTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/NativeOpsTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/NlpTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/NlpTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/NlpTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/NlpTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/NodeTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/NodeTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/NodeTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/NodeTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/OmpLaunchHelperTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/OmpLaunchHelperTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/OmpLaunchHelperTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/OmpLaunchHelperTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/OneOffTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/OneOffTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/OneOffTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/OneOffTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/OpTrackerTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/OpTrackerTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/OpTrackerTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/OpTrackerTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/OpTupleTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/OpTupleTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/OpTupleTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/OpTupleTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/PairwiseTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/PairwiseTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/PairwiseTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/PairwiseTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/ParityOpsTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/ParityOpsTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/ParityOpsTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/ParityOpsTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/PerformanceTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/PerformanceTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/PerformanceTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/PerformanceTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/PlaygroundTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/PlaygroundTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/PlaygroundTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/PlaygroundTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/PrimitivesTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/PrimitivesTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/PrimitivesTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/PrimitivesTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/ProtoBufTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/ProtoBufTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/ProtoBufTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/ProtoBufTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/QuantizationTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/QuantizationTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/QuantizationTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/QuantizationTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/RNGTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/RNGTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/RNGTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/RNGTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/ResultSetTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/ResultSetTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/ResultSetTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/ResultSetTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/SanityTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/SanityTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/SanityTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/SanityTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/ScalarTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/ScalarTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/ScalarTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/ScalarTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/ScopeTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/ScopeTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/ScopeTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/ScopeTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/ServerRelatedTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/ServerRelatedTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/ServerRelatedTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/ServerRelatedTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/ShapeTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/ShapeTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/ShapeTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/ShapeTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/ShapeTests2.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/ShapeTests2.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/ShapeTests2.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/ShapeTests2.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/ShapeUtilsTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/ShapeUtilsTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/ShapeUtilsTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/ShapeUtilsTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/SingleDimTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/SingleDimTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/SingleDimTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/SingleDimTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/SortCpuTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/SortCpuTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/SortCpuTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/SortCpuTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/SortCudaTests.cu b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/SortCudaTests.cu similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/SortCudaTests.cu rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/SortCudaTests.cu diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/SparseUtilsTest.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/SparseUtilsTest.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/SparseUtilsTest.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/SparseUtilsTest.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/StashTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/StashTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/StashTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/StashTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/StringTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/StringTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/StringTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/StringTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/SwitchTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/SwitchTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/SwitchTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/SwitchTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/TadTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/TadTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/TadTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/TadTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/ThreadsTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/ThreadsTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/ThreadsTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/ThreadsTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/TypeCastTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/TypeCastTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/TypeCastTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/TypeCastTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/VariableProxyTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/VariableProxyTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/VariableProxyTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/VariableProxyTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/VariableSpaceTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/VariableSpaceTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/VariableSpaceTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/VariableSpaceTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/VariableTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/VariableTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/VariableTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/VariableTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/WorkspaceTests.cpp b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/WorkspaceTests.cpp similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/WorkspaceTests.cpp rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/WorkspaceTests.cpp diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/WorkspaceTests.cu b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/WorkspaceTests.cu similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/WorkspaceTests.cu rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/WorkspaceTests.cu diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/suppressions.txt b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/suppressions.txt similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/suppressions.txt rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/suppressions.txt diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/testinclude.h b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/testinclude.h similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/testinclude.h rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/testinclude.h diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/testlayers.h b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/testlayers.h similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/layers_tests/testlayers.h rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/layers_tests/testlayers.h diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/libnd4j_tests/CMakeLists.txt b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/libnd4j_tests/CMakeLists.txt similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/libnd4j_tests/CMakeLists.txt rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/libnd4j_tests/CMakeLists.txt diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/resources/arr_3,4_float32.npy b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/resources/arr_3,4_float32.npy similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/resources/arr_3,4_float32.npy rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/resources/arr_3,4_float32.npy diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/resources/assert_type_rank2_int64.fb b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/resources/assert_type_rank2_int64.fb similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/resources/assert_type_rank2_int64.fb rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/resources/assert_type_rank2_int64.fb diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/resources/assertsomething.fb b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/resources/assertsomething.fb similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/resources/assertsomething.fb rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/resources/assertsomething.fb diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/resources/avg_pooling3d.fb b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/resources/avg_pooling3d.fb similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/resources/avg_pooling3d.fb rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/resources/avg_pooling3d.fb diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/resources/channels_last_b1_k2_s1_d1_SAME_crelu.fb b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/resources/channels_last_b1_k2_s1_d1_SAME_crelu.fb similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/resources/channels_last_b1_k2_s1_d1_SAME_crelu.fb rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/resources/channels_last_b1_k2_s1_d1_SAME_crelu.fb diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/resources/cond_true.fb b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/resources/cond_true.fb similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/resources/cond_true.fb rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/resources/cond_true.fb diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/resources/identity_n_2.fb b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/resources/identity_n_2.fb similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/resources/identity_n_2.fb rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/resources/identity_n_2.fb diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/resources/non2d_0A.fb b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/resources/non2d_0A.fb similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/resources/non2d_0A.fb rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/resources/non2d_0A.fb diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/resources/non2d_1.fb b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/resources/non2d_1.fb similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/resources/non2d_1.fb rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/resources/non2d_1.fb diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/resources/pad_1D.fb b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/resources/pad_1D.fb similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/resources/pad_1D.fb rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/resources/pad_1D.fb diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/resources/reduce_all_rank2_d0_keep.fb b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/resources/reduce_all_rank2_d0_keep.fb similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/resources/reduce_all_rank2_d0_keep.fb rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/resources/reduce_all_rank2_d0_keep.fb diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/resources/scalar_float32.fb b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/resources/scalar_float32.fb similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/resources/scalar_float32.fb rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/resources/scalar_float32.fb diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/resources/scatter_nd_update.fb b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/resources/scatter_nd_update.fb similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/resources/scatter_nd_update.fb rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/resources/scatter_nd_update.fb diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/resources/simpleif_0_alt.fb b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/resources/simpleif_0_alt.fb similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/resources/simpleif_0_alt.fb rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/resources/simpleif_0_alt.fb diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/resources/simplewhile_1.fb b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/resources/simplewhile_1.fb similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/resources/simplewhile_1.fb rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/resources/simplewhile_1.fb diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/resources/simplewhile_nested.fb b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/resources/simplewhile_nested.fb similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/resources/simplewhile_nested.fb rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/resources/simplewhile_nested.fb diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/resources/tensor_array_close_sz1_float32_nodynamic_noname_noshape.fb b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/resources/tensor_array_close_sz1_float32_nodynamic_noname_noshape.fb similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/resources/tensor_array_close_sz1_float32_nodynamic_noname_noshape.fb rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/resources/tensor_array_close_sz1_float32_nodynamic_noname_noshape.fb diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/resources/tensor_array_split_sz1_float32_nodynamic_noname_noshape.fb b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/resources/tensor_array_split_sz1_float32_nodynamic_noname_noshape.fb similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/resources/tensor_array_split_sz1_float32_nodynamic_noname_noshape.fb rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/resources/tensor_array_split_sz1_float32_nodynamic_noname_noshape.fb diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/resources/tensor_array_stack_sz3-1_int32_dynamic_name_shape.fb b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/resources/tensor_array_stack_sz3-1_int32_dynamic_name_shape.fb similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/resources/tensor_array_stack_sz3-1_int32_dynamic_name_shape.fb rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/resources/tensor_array_stack_sz3-1_int32_dynamic_name_shape.fb diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/resources/tensor_array_unstack_sz1_int64_nodynamic_noname_shape2-3.fb b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/resources/tensor_array_unstack_sz1_int64_nodynamic_noname_shape2-3.fb similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/resources/tensor_array_unstack_sz1_int64_nodynamic_noname_shape2-3.fb rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/resources/tensor_array_unstack_sz1_int64_nodynamic_noname_shape2-3.fb diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/resources/while_iter3.fb b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/resources/while_iter3.fb similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/resources/while_iter3.fb rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/resources/while_iter3.fb diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/run_minifier.sh b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/run_minifier.sh similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/run_minifier.sh rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/run_minifier.sh diff --git a/cavis-native/cavis-native-lib/src/test/tests_cpu/run_tests.sh b/cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/run_tests.sh similarity index 100% rename from cavis-native/cavis-native-lib/src/test/tests_cpu/run_tests.sh rename to cavis-native/cavis-native-lib/src/test/cpp/tests_cpu/run_tests.sh