Refactor tests to new path.
BUG: 167961889
Test: TH
Change-Id: I2d4a9643a8c3a640784f7fa230cb376827b95fba
diff --git a/TEST_MAPPING b/TEST_MAPPING
index d2ef51e..bbe3960 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -15,7 +15,7 @@
//
// The value here is a bitmask indicating only "pass 10"
// should be run (1024 = 2^10). The bit conversions can be
- // found in frameworks/ml/nn/runtime/test/TestMain.cpp.
+ // found in packages/modules/NeuralNetworks/runtime/test/TestMain.cpp.
"native-test-flag": "1024"
}
]
diff --git a/runtime/test/Android.bp b/runtime/test/Android.bp
index 65d9de6..a0b0ad1 100644
--- a/runtime/test/Android.bp
+++ b/runtime/test/Android.bp
@@ -340,10 +340,10 @@
"generated/spec_V1_*/*.example.cpp",
],
include_dirs: [
- "frameworks/ml/nn/common/include",
- "frameworks/ml/nn/runtime/",
- "frameworks/ml/nn/runtime/include/",
- "frameworks/ml/nn/tools/test_generator/test_harness/include",
+ "packages/modules/NeuralNetworks/common/include",
+ "packages/modules/NeuralNetworks/runtime/",
+ "packages/modules/NeuralNetworks/runtime/include/",
+ "packages/modules/NeuralNetworks/tools/test_generator/test_harness/include",
],
cflags: [
"-DNNTEST_CTS",
diff --git a/runtime/test/TestMain.cpp b/runtime/test/TestMain.cpp
index f89c7ad..a8ce555 100644
--- a/runtime/test/TestMain.cpp
+++ b/runtime/test/TestMain.cpp
@@ -56,7 +56,7 @@
// true, and if we are asked to set it to false, we return 0 ("success") without
// running tests.
static int test(bool useCpuOnly, Execution::ComputeMode computeMode, bool allowSyncExecHal = true) {
- // NOTE: The test mapping configuration (frameworks/ml/nn/TEST_MAPPING) uses
+ // NOTE: The test mapping configuration (packages/modules/NeuralNetworks/TEST_MAPPING) uses
// the value of 1024 to only run pass 10 of the test, corresponding to
// "useCpuOnly = 0, computeMode = ComputeMode::ASYNC, allowSyncExecHal = 1".
// If you change the bit representation here, also make the corresponding
diff --git a/runtime/test/fuzzing/visualize_random_graph.sh b/runtime/test/fuzzing/visualize_random_graph.sh
index f24f498..9c7086b 100755
--- a/runtime/test/fuzzing/visualize_random_graph.sh
+++ b/runtime/test/fuzzing/visualize_random_graph.sh
@@ -20,7 +20,7 @@
TEST_NAME=$1
SPEC_NAME=${TEST_NAME//[\/.]/_}
-GENERATOR_DIR=$ANDROID_BUILD_TOP/frameworks/ml/nn/tools/test_generator
+GENERATOR_DIR=$ANDROID_BUILD_TOP/packages/modules/NeuralNetworks/tools/test_generator
NNTEST_DIR=$ANDROID_PRODUCT_OUT/data/nativetest
# Create tmp dir for spec dump.
diff --git a/runtime/test/specs/visualize_spec.sh b/runtime/test/specs/visualize_spec.sh
index 20bfae0..afd24da 100755
--- a/runtime/test/specs/visualize_spec.sh
+++ b/runtime/test/specs/visualize_spec.sh
@@ -21,7 +21,7 @@
SPEC_FILE=$1
SPEC_NAME=`basename -s .mod.py $1`
-VISUALIZER_DIR=$ANDROID_BUILD_TOP/frameworks/ml/nn/tools/test_generator
+VISUALIZER_DIR=$ANDROID_BUILD_TOP/packages/modules/NeuralNetworks/tools/test_generator
# Create tmp dir for the generated HTML.
LOG_DIR=$(mktemp -d)/nnapi-spec-html
diff --git a/tools/api/generate_api.sh b/tools/api/generate_api.sh
index 80de7d1..5581fcc 100755
--- a/tools/api/generate_api.sh
+++ b/tools/api/generate_api.sh
@@ -27,7 +27,7 @@
TOOL=$(dirname $0)/generate_api.py
SPECFILE=$(dirname $0)/types.spec
HALDIR=${ANDROID_BUILD_TOP}/hardware/interfaces/neuralnetworks
-NDKDIR=${ANDROID_BUILD_TOP}/frameworks/ml/nn/runtime/include
+NDKDIR=${ANDROID_BUILD_TOP}/packages/modules/NeuralNetworks/runtime/include
RET=0
function doit {
diff --git a/tools/build_and_run_benchmark.sh b/tools/build_and_run_benchmark.sh
index 1d4d029..d74f154 100755
--- a/tools/build_and_run_benchmark.sh
+++ b/tools/build_and_run_benchmark.sh
@@ -81,7 +81,7 @@
done
echo "CPU run data from 'parse_benchmark.py $LOGFILE'"
-$ANDROID_BUILD_TOP/frameworks/ml/nn/tools/parse_benchmark.py $LOGFILE
+$ANDROID_BUILD_TOP/packages/modules/NeuralNetworks/tools/parse_benchmark.py $LOGFILE
# Run with driver
LOGFILE=$LOGDIR/perf-driver.txt
@@ -97,4 +97,4 @@
done
echo "Driver run data from 'parse_benchmark.py $LOGFILE'"
-$ANDROID_BUILD_TOP/frameworks/ml/nn/tools/parse_benchmark.py $LOGFILE
+$ANDROID_BUILD_TOP/packages/modules/NeuralNetworks/tools/parse_benchmark.py $LOGFILE
diff --git a/tools/test_generator/README.md b/tools/test_generator/README.md
index e781771..0297dce 100644
--- a/tools/test_generator/README.md
+++ b/tools/test_generator/README.md
@@ -7,7 +7,7 @@
## Writing a Test Specification
-You should create new test specs in `nn/runtime/test/specs/<version>/` and name it with `.mod.py` suffix, so that other tools can automatically update the unit tests.
+You should create new test specs in `runtime/test/specs/<version>/` and name it with `.mod.py` suffix, so that other tools can automatically update the unit tests.
### Specifying Operands
@@ -465,7 +465,7 @@
Once you have your model ready, run
```
-$ANDROID_BUILD_TOP/frameworks/ml/nn/runtime/test/specs/generate_all_tests.sh
+$ANDROID_BUILD_TOP/packages/modules/NeuralNetworks/runtime/test/specs/generate_all_tests.sh
```
It will update all CTS and VTS tests based on spec files in `nn/runtime/test/specs/V1_*/*`.
diff --git a/tools/test_generator/test_harness/include_legacy/TestHarness.h b/tools/test_generator/test_harness/include_legacy/TestHarness.h
index 7d7d970..f4211f7 100644
--- a/tools/test_generator/test_harness/include_legacy/TestHarness.h
+++ b/tools/test_generator/test_harness/include_legacy/TestHarness.h
@@ -15,7 +15,7 @@
*/
/* Header-only library for various helpers of test harness
- * See frameworks/ml/nn/runtime/test/TestGenerated.cpp for how this is used.
+ * See packages/modules/NeuralNetworks/runtime/test/TestGenerated.cpp for how this is used.
*/
#ifndef ANDROID_FRAMEWORKS_ML_NN_TOOLS_TEST_GENERATOR_TEST_HARNESS_LEGACY_TEST_HARNESS_H
#define ANDROID_FRAMEWORKS_ML_NN_TOOLS_TEST_GENERATOR_TEST_HARNESS_LEGACY_TEST_HARNESS_H
@@ -425,4 +425,4 @@
}; // namespace test_helper
-#endif // ANDROID_FRAMEWORKS_ML_NN_TOOLS_TEST_GENERATOR_TEST_HARNESS_LEGACY_TEST_HARNESS_H
\ No newline at end of file
+#endif // ANDROID_FRAMEWORKS_ML_NN_TOOLS_TEST_GENERATOR_TEST_HARNESS_LEGACY_TEST_HARNESS_H
