Skip to content

Commit b0d7d88

Browse files
seanshparkseanshpark
committed
[cmn-arts] Revise minimum python3 as 3.10
This will revise to use python3.10 as minimum version. ONE-DCO-1.0-Signed-off-by: SaeHie Park <saehie.park@gmail.com>
1 parent 0d4f9ce commit b0d7d88

File tree

5 files changed

+96
-33
lines changed

5 files changed

+96
-33
lines changed

‎compiler/common-artifacts/CMakeLists.txt‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,23 @@
11
#[[ Generate common python virtual enviornment ]]
2-
# NOTE find_package try to use at least python3.8 as follows depending on platform version
3-
# Ubuntu18.04; explictly installed python3.8 (default is python3.6)
4-
# Ubuntu20.04; default python3.8
2+
# NOTE find_package try to use at least python3.10 as follows depending on platform version
3+
# Ubuntu20.04; explictly installed python3.10 (default is python3.8)
54
# Ubuntu22.04; default python3.10
65
# Ubuntu24.04; default python3.12
76
# refer https://github.com/Samsung/ONE/issues/9962
8-
# find python 3.8 or above
9-
find_package(Python 3.8 EXACT COMPONENTS Interpreter QUIET)
7+
# refer https://github.com/Samsung/ONE/issues/15226
8+
# find python 3.10 or above
9+
find_package(Python 3.10 EXACT COMPONENTS Interpreter QUIET)
1010
if(NOT Python_FOUND)
11-
find_package(Python 3.8 COMPONENTS Interpreter QUIET)
11+
find_package(Python 3.10 COMPONENTS Interpreter QUIET)
1212
endif()
1313

1414
if(NOT Python_Interpreter_FOUND)
1515
message(STATUS "Build common-artifacts: FAILED (Python3 is missing)")
1616
return()
1717
endif()
1818

19-
# NOTE assume only use 3.8.x or 3.10.x or 3.12.x
20-
if((Python_VERSION VERSION_GREATER_EQUAL 3.8) AND (Python_VERSION VERSION_LESS 3.9))
21-
set(PYTHON_VERSION_MINOR 8)
22-
elseif((Python_VERSION VERSION_GREATER_EQUAL 3.10) AND (Python_VERSION VERSION_LESS 3.11))
19+
# NOTE assume only use 3.10.x or 3.12.x
20+
if((Python_VERSION VERSION_GREATER_EQUAL 3.10) AND (Python_VERSION VERSION_LESS 3.11))
2321
set(PYTHON_VERSION_MINOR 10)
2422
elseif((Python_VERSION VERSION_GREATER_EQUAL 3.12) AND (Python_VERSION VERSION_LESS 3.13))
2523
set(PYTHON_VERSION_MINOR 12)
@@ -48,8 +46,8 @@ set(REQUIREMENTS_FILE "requirements.txt")
4846
set(REQUIREMENTS_OVERLAY_PATH "${VIRTUALENV_OVERLAY}/${REQUIREMENTS_FILE}")
4947

5048
set(PYTHON_OVERLAY python3)
51-
if(PYTHON_EXECUTABLE MATCHES python3.8)
52-
set(PYTHON_OVERLAY python3.8)
49+
if(PYTHON_EXECUTABLE MATCHES python3.10)
50+
set(PYTHON_OVERLAY python3.10)
5351
endif()
5452

5553
# NOTE when using behind proxy with self signed certificate, need to set '--trusted-host' options

‎compiler/dalgona/CMakeLists.txt‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,23 @@
1-
# NOTE find_package will try to use at least python3.8 as follows depending on platform version
2-
# Ubuntu18.04; explictly installed python3.8 (default is python3.6)
3-
# Ubuntu20.04; default python3.8
1+
# NOTE find_package will try to use at least python3.10 as follows depending on platform version
2+
# Ubuntu20.04; explictly installed python3.10 (default is python3.8)
43
# Ubuntu22.04; default python3.10
54
# Ubuntu24.04; default python3.12
65
# refer https://github.com/Samsung/ONE/issues/9962
6+
# refer https://github.com/Samsung/ONE/issues/15226
77
# NOTE Require same python version of common-artifacts
8-
# find python 3.8 or above
9-
find_package(Python 3.8 EXACT COMPONENTS Interpreter Development QUIET)
8+
# find python 3.10 or above
9+
find_package(Python 3.10 EXACT COMPONENTS Interpreter Development QUIET)
1010
if(NOT Python_FOUND)
11-
find_package(Python 3.8 COMPONENTS Interpreter Development QUIET)
11+
find_package(Python 3.10 COMPONENTS Interpreter Development QUIET)
1212
endif()
1313

1414
if(NOT Python_Development_FOUND)
1515
message(STATUS "Build dalgona: FAILED (Python3 development package is missing)")
1616
return()
1717
endif()
1818

19-
# NOTE assume only use 3.8.x or 3.10.x or 3.12.x
20-
if((Python_VERSION VERSION_GREATER_EQUAL 3.8) AND (Python_VERSION VERSION_LESS 3.9))
21-
set(PYTHON_VERSION_MINOR 8)
22-
elseif((Python_VERSION VERSION_GREATER_EQUAL 3.10) AND (Python_VERSION VERSION_LESS 3.11))
19+
# NOTE assume only use 3.10.x or 3.12.x
20+
if((Python_VERSION VERSION_GREATER_EQUAL 3.10) AND (Python_VERSION VERSION_LESS 3.11))
2321
set(PYTHON_VERSION_MINOR 10)
2422
elseif((Python_VERSION VERSION_GREATER_EQUAL 3.12) AND (Python_VERSION VERSION_LESS 3.13))
2523
set(PYTHON_VERSION_MINOR 12)

‎compiler/fm-equalize-value-py-test/CMakeLists.txt‎

Lines changed: 35 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ if (NOT DEFINED ONE_PYTHON_VERSION_MINOR)
1111
endif()
1212
set(PYTHON_SITE_PACKAGES "${VIRTUALENV}/lib/python3.${ONE_PYTHON_VERSION_MINOR}/site-packages")
1313

14+
message(STATUS "!!! PYTHON_SITE_PACKAGES: ${PYTHON_SITE_PACKAGES}")
15+
1416
get_target_property(ARTIFACTS_BIN_PATH testDataGenerator BINARY_DIR)
1517
get_target_property(FM_EQUALIZE_BIN_PATH fm-equalize BINARY_DIR)
1618
get_target_property(FME_DETECT_BIN_PATH fme-detect BINARY_DIR)
@@ -40,13 +42,25 @@ macro(eval RECIPE)
4042
set(AFTER_CIRCLE_PATTERN_PATH "${CMAKE_CURRENT_BINARY_DIR}/${AFETR_PATTERN_FILE}")
4143

4244
# Apply fm-equalize
45+
#add_custom_command(OUTPUT ${AFTER_CIRCLE_OUTPUT_PATH} ${AFTER_CIRCLE_PATTERN_PATH}
46+
# COMMAND ${CMAKE_COMMAND} -E env
47+
# PYTHONPATH=${PYTHON_SITE_PACKAGES}
48+
# ${VIRTUALENV}/bin/python ${FM_EQUALIZE_BIN} -i ${OPT_CIRCLE_OUTPUT_PATH}
49+
# -o ${AFTER_CIRCLE_OUTPUT_PATH} -f ${AFTER_CIRCLE_PATTERN_PATH}
50+
# --fme_detect ${FME_DETECT_BIN} --dalgona ${DALGONA_BIN}
51+
# --fme_apply ${FME_APPLY_BIN}
52+
# DEPENDS ${FM_EQUALIZE_BIN} ${OPT_CIRCLE_OUTPUT_PATH} ${FME_APPLY_BIN} ${FME_DETECT_BIN} ${DALGONA_BIN}
53+
# COMMENT "Apply fm-equalize to ${OPT_CIRCLE_OUTPUT_PATH}"
54+
#)
55+
4356
add_custom_command(OUTPUT ${AFTER_CIRCLE_OUTPUT_PATH} ${AFTER_CIRCLE_PATTERN_PATH}
44-
COMMAND ${CMAKE_COMMAND} -E env
45-
PYTHONPATH=${PYTHON_SITE_PACKAGES}
46-
${VIRTUALENV}/bin/python ${FM_EQUALIZE_BIN} -i ${OPT_CIRCLE_OUTPUT_PATH}
47-
-o ${AFTER_CIRCLE_OUTPUT_PATH} -f ${AFTER_CIRCLE_PATTERN_PATH}
48-
--fme_detect ${FME_DETECT_BIN} --dalgona ${DALGONA_BIN}
49-
--fme_apply ${FME_APPLY_BIN}
57+
COMMAND ${CMAKE_COMMAND} -E env PYTHONPATH=${PYTHON_SITE_PACKAGES}
58+
bash run_equalize_bin.sh ${VIRTUALENV}
59+
${FM_EQUALIZE_BIN} ${OPT_CIRCLE_OUTPUT_PATH}
60+
${AFTER_CIRCLE_OUTPUT_PATH} ${AFTER_CIRCLE_PATTERN_PATH}
61+
${FME_DETECT_BIN} ${DALGONA_BIN}
62+
${FME_APPLY_BIN}
63+
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
5064
DEPENDS ${FM_EQUALIZE_BIN} ${OPT_CIRCLE_OUTPUT_PATH} ${FME_APPLY_BIN} ${FME_DETECT_BIN} ${DALGONA_BIN}
5165
COMMENT "Apply fm-equalize to ${OPT_CIRCLE_OUTPUT_PATH}"
5266
)
@@ -63,11 +77,21 @@ include("test.local.lst" OPTIONAL)
6377
add_custom_target(fm_equalize_value_py_test_files ALL DEPENDS ${TEST_DEPS})
6478
add_dependencies(fm_equalize_value_py_test_files common_artifacts_deps)
6579

80+
#add_test(NAME fm_equalize_value_py_test
81+
# COMMAND ${VIRTUALENV}/bin/python -m pytest -sv test_luci_eval.py
82+
# --test_list ${TEST_LIST_FILE}
83+
# --tflite_dir ${ARTIFACTS_BIN_PATH}
84+
# --circle_dir ${CMAKE_CURRENT_BINARY_DIR}
85+
# --luci_eval_driver $<TARGET_FILE:luci_eval_driver>
86+
# WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
87+
#)
88+
6689
add_test(NAME fm_equalize_value_py_test
67-
COMMAND ${VIRTUALENV}/bin/python -m pytest -sv test_luci_eval.py
68-
--test_list ${TEST_LIST_FILE}
69-
--tflite_dir ${ARTIFACTS_BIN_PATH}
70-
--circle_dir ${CMAKE_CURRENT_BINARY_DIR}
71-
--luci_eval_driver $<TARGET_FILE:luci_eval_driver>
90+
COMMAND bash test_luci_eval.sh
91+
${VIRTUALENV}
92+
${TEST_LIST_FILE}
93+
${ARTIFACTS_BIN_PATH}
94+
${CMAKE_CURRENT_BINARY_DIR}
95+
$<TARGET_FILE:luci_eval_driver>
7296
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
7397
)

‎compiler/fm-equalize-value-py-test/run_equalize_bin.sh‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#!/bin/bash
2+
3+
# TODO add check arguments
4+
5+
VIRTUAL_ENV=$1; shift
6+
FM_EQUALIZE_BIN=$1; shift
7+
OPT_CIRCLE_OUTPUT_PATH=$1; shift
8+
AFTER_CIRCLE_OUTPUT_PATH=$1; shift
9+
AFTER_CIRCLE_PATTERN_PATH=$1; shift
10+
FME_DETECT_BIN=$1; shift
11+
DALGONA_BIN=$1; shift
12+
FME_APPLY_BIN=$1; shift
13+
14+
source ${VIRTUAL_ENV}/bin/activate
15+
16+
python ${FM_EQUALIZE_BIN} \
17+
-i ${OPT_CIRCLE_OUTPUT_PATH} \
18+
-o ${AFTER_CIRCLE_OUTPUT_PATH} \
19+
-f ${AFTER_CIRCLE_PATTERN_PATH} \
20+
--fme_detect ${FME_DETECT_BIN} \
21+
--dalgona ${DALGONA_BIN} \
22+
--fme_apply ${FME_APPLY_BIN}
23+
24+
deactivate

‎compiler/fm-equalize-value-py-test/test_luci_eval.sh‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#!/bin/bash
2+
3+
# TODO add check arguments
4+
5+
VIRTUAL_ENV=$1; shift
6+
TEST_LIST_FILE=$1; shift
7+
ARTIFACTS_BIN_PATH=$1; shift
8+
CMAKE_CURRENT_BINARY_DIR=$1; shift
9+
LUCI_EVAL_DRIVER=$1; shift
10+
11+
source ${VIRTUAL_ENV}/bin/activate
12+
13+
python -m pytest -sv test_luci_eval.py \
14+
--test_list ${TEST_LIST_FILE} \
15+
--tflite_dir ${ARTIFACTS_BIN_PATH} \
16+
--circle_dir ${CMAKE_CURRENT_BINARY_DIR} \
17+
--luci_eval_driver ${LUCI_EVAL_DRIVER}
18+
19+
deactivate

0 commit comments

Comments
 (0)