Skip to content

Commit 721d5ca

Browse files
committed
[infra] Fix relative paths in nnas, nncc and nnfw scripts
This commit fixes the problem where it is not possible to use the nn* scripts outside of the project's root directory. ONE-DCO-1.0-Signed-off-by: Arkadiusz Bokowy <a.bokowy@samsung.com>
1 parent 57144d0 commit 721d5ca

3 files changed

Lines changed: 10 additions & 6 deletions

File tree

nnas

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,15 @@
22

33
NNAS_CONFIG_RPATH="infra/config"
44
NNAS_COMMAND_RPATH="infra/command"
5+
56
NNAS_PROJECT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
7+
NNAS_COMMAND_PATH="${NNAS_PROJECT_PATH}/${NNAS_COMMAND_RPATH}"
68

79
function Usage()
810
{
911
echo "Usage: $0 [COMMAND] ..."
1012
echo "Command:"
11-
for file in "$NNAS_COMMAND_RPATH"/*;
13+
for file in "$NNAS_COMMAND_PATH"/*;
1214
do
1315
echo " $(basename "$file")"
1416
done
@@ -26,7 +28,7 @@ if [[ -z "${COMMAND}" ]]; then
2628
exit 255
2729
fi
2830

29-
COMMAND_FILE="${NNAS_PROJECT_PATH}/${NNAS_COMMAND_RPATH}/${COMMAND}"
31+
COMMAND_FILE="${NNAS_COMMAND_PATH}/${COMMAND}"
3032

3133
if [[ ! -f "${COMMAND_FILE}" ]]; then
3234
echo "ERROR: '${COMMAND}' is not supported"

nncc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@ NNCC_SCRIPT_RPATH="scripts"
44
NNCC_COMMAND_RPATH="infra/nncc/command"
55

66
NNCC_PROJECT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
7+
NNCC_COMMAND_PATH="${NNCC_PROJECT_PATH}/${NNCC_COMMAND_RPATH}"
78
NNCC_SCRIPT_PATH="${NNCC_PROJECT_PATH}/${NNCC_SCRIPT_RPATH}"
89

910
function Usage()
1011
{
1112
echo "Usage: $0 [COMMAND] ..."
1213
echo "Command:"
13-
for file in "$NNCC_COMMAND_RPATH"/*;
14+
for file in "$NNCC_COMMAND_PATH"/*;
1415
do
1516
echo " $(basename "$file")"
1617
done
@@ -24,7 +25,7 @@ if [[ -z "${COMMAND}" ]]; then
2425
exit 255
2526
fi
2627

27-
COMMAND_FILE="${NNCC_PROJECT_PATH}/${NNCC_COMMAND_RPATH}/${COMMAND}"
28+
COMMAND_FILE="${NNCC_COMMAND_PATH}/${COMMAND}"
2829

2930
if [[ ! -f "${COMMAND_FILE}" ]]; then
3031
echo "ERROR: '${COMMAND}' is not supported"

nnfw

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@ NNFW_SCRIPT_RPATH="runtime/infra"
44
NNFW_COMMAND_RPATH="${NNFW_SCRIPT_RPATH}/command"
55

66
NNFW_PROJECT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
7+
NNFW_COMMAND_PATH="${NNFW_PROJECT_PATH}/${NNFW_COMMAND_RPATH}"
78
NNFW_SCRIPT_PATH="${NNFW_PROJECT_PATH}/${NNFW_SCRIPT_RPATH}"
89

910
function Usage()
1011
{
1112
echo "Usage: $0 [COMMAND] ..."
1213
echo "Command:"
13-
for file in "$NNFW_COMMAND_RPATH"/*;
14+
for file in "$NNFW_COMMAND_PATH"/*;
1415
do
1516
echo " $(basename "$file")"
1617
done
@@ -23,7 +24,7 @@ if [[ -z "${COMMAND}" ]]; then
2324
exit 255
2425
fi
2526

26-
COMMAND_FILE="${NNFW_PROJECT_PATH}/${NNFW_COMMAND_RPATH}/${COMMAND}"
27+
COMMAND_FILE="${NNFW_COMMAND_PATH}/${COMMAND}"
2728

2829
if [[ ! -f "${COMMAND_FILE}" ]]; then
2930
echo "ERROR: '${COMMAND}' is not supported"

0 commit comments

Comments
 (0)