Skip to content

Commit d308930

Browse files
authored
[infra] Fix relative paths in nnas, nncc and nnfw scripts (#16251)
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 ced1206 commit d308930

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

nnas

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
NNAS_CONFIG_RPATH="infra/config"
44
NNAS_COMMAND_RPATH="infra/command"
55
NNAS_PROJECT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
6+
NNAS_COMMAND_PATH="${NNAS_PROJECT_PATH}/${NNAS_COMMAND_RPATH}"
67

78
function Usage()
89
{
910
echo "Usage: $0 [COMMAND] ..."
1011
echo "Command:"
11-
for file in "$NNAS_COMMAND_RPATH"/*;
12+
for file in "$NNAS_COMMAND_PATH"/*;
1213
do
1314
echo " $(basename "$file")"
1415
done
@@ -26,7 +27,7 @@ if [[ -z "${COMMAND}" ]]; then
2627
exit 255
2728
fi
2829

29-
COMMAND_FILE="${NNAS_PROJECT_PATH}/${NNAS_COMMAND_RPATH}/${COMMAND}"
30+
COMMAND_FILE="${NNAS_COMMAND_PATH}/${COMMAND}"
3031

3132
if [[ ! -f "${COMMAND_FILE}" ]]; then
3233
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)