Skip to content

Commit

Permalink
[nnfwapi] Rename everything to "NNFW API" (Samsung#2090)
Browse files Browse the repository at this point in the history
Rename everything with "ONEAPI" to "NNFW API". This is to avoid
confusion on inconsistent names for the same thing.

ONE-DCO-1.0-Signed-off-by: Hanjoung Lee <[email protected]>
  • Loading branch information
wateret authored Jun 11, 2020
1 parent dfdf2b3 commit eb631b5
Show file tree
Hide file tree
Showing 14 changed files with 12 additions and 12 deletions.
File renamed without changes.
10 changes: 5 additions & 5 deletions infra/scripts/test_ubuntu_runtime_mixed.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,20 @@ CheckTestPrepared
TEST_ARCH=$(uname -m | tr '[:upper:]' '[:lower:]')
TEST_OS="linux"

# oneapi_test
# nnfw_api_gtest
# NOTE: This test is run here as it does not depend on BACKEND or EXECUTOR

# This test requires test model installation
pushd ${ROOT_PATH} > /dev/null
echo
echo "==== Run oneapi_test begin ===="
echo "==== Run nnfw_api_gtest begin ===="
echo
ONEAPI_TEST_MODEL_INSTALLER=tests/scripts/oneapi_test/install_oneapi_test_nnpackages.sh
NNFW_API_TEST_MODEL_INSTALLER=tests/scripts/nnfw_api_gtest/install_nnfw_api_gtest_nnpackages.sh
TEST_BIN=Product/out/unittest_standalone/nnfw_api_gtest
$ONEAPI_TEST_MODEL_INSTALLER --install-dir ${TEST_BIN}_models
$NNFW_API_TEST_MODEL_INSTALLER --install-dir ${TEST_BIN}_models
${TEST_BIN}
echo
echo "==== Run oneapi_test end ===="
echo "==== Run nnfw_api_gtest end ===="
echo
popd > /dev/null

Expand Down
2 changes: 1 addition & 1 deletion infra/scripts/tizen_xu4_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ function install_model()

# download api test model file for nnfw_api_gtest
MODEL_CACHE_DIR=$(mktemp -d)
tests/scripts/oneapi_test/install_oneapi_test_nnpackages.sh --install-dir $MODEL_CACHE_DIR
tests/scripts/nnfw_api_gtest/install_nnfw_api_gtest_nnpackages.sh --install-dir $MODEL_CACHE_DIR
tar -zcf $MODEL_CACHE_DIR/api_model_test.tar.gz -C $MODEL_CACHE_DIR .
$SDB_CMD push $MODEL_CACHE_DIR/api_model_test.tar.gz $TEST_ROOT/Product/out/unittest_standalone/nnfw_api_gtest_models/
$SDB_CMD shell tar -zxf $TEST_ROOT/Product/out/unittest_standalone/nnfw_api_gtest_models/api_model_test.tar.gz \
Expand Down
10 changes: 5 additions & 5 deletions tests/nnfw_api/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# oneapi_test
# nnfw_api_gtest

A test framework for *oneapi* that is built with *gtest*.
A test framework for *nnfw_api* that is built with *gtest*.

This test framework consists of 3 kinds of tests:

Expand All @@ -14,15 +14,15 @@ This test framework consists of 3 kinds of tests:

## nnpackages for testing

To test *oneapi*, we almost always need some nnpackages. Those are stored in a web server so there is no nnpackage files in the repo.
To test *nnfw_api*, we almost always need some nnpackages. Those are stored in a web server so there is no nnpackage files in the repo.

### How to add nnpackages for test

If there is no nnpackage that is sufficient for your need, you may need to create one. However it is not allowed to store nnpackage files in the repo.
If you want to add some, please leave an issue of asking for adding new nnpackages to the server. Then add `config.sh` for each nnpackage in `tests/scripts/oneapi_test/models`.
If you want to add some, please leave an issue of asking for adding new nnpackages to the server. Then add `config.sh` for each nnpackage in `tests/scripts/nnfw_api_gtest_models`.

Once you have done the above steps, please register it in the test source code to make use of it. You may take a look at `NNPackages` class for details.

### Installation

You must install the test nnpackages before running the tests. They must be in the same directory with the test executable, under `nnfw_api_gtest_models/`. There is an installation script `tests/scripts/oneapi_test/install_oneapi_test_nnpackages.sh`, however the nnpackage file server is not public so it will fail.
You must install the test nnpackages before running the tests. They must be in the same directory with the test executable, under `nnfw_api_gtest_models/`. There is an installation script `tests/scripts/nnfw_api_gtest/install_nnfw_api_gtest_nnpackages.sh`, however the nnpackage file server is not public so it will fail.
2 changes: 1 addition & 1 deletion tests/nnfw_api/src/NNPackages.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* @brief A helper class to find NN Packages for testing
* To add a nnpackage for your test, please do the followings:
* 0. Prerequisite: the actual file must be uploaded on the server
* Add `config.sh` file to `tests/scripts/oneapi_test/models`
* Add `config.sh` file to `tests/scripts/nnfw_api_gtest_models`
* 1. Append an enum value to @c NNPackages::TestPackages
* 2. Append a string literal to @c TEST_PACKAGE_NAMES in the source file
*/
Expand Down

0 comments on commit eb631b5

Please sign in to comment.