DRAFT compiler support U24.04

seanshpark · seanshpark · commit 98f73ded4351 · 2025-04-29T13:16:35.000+09:00
on-going draft with compiler support U24.04

Signed-off-by: SaeHie Park &lt;saehie.park@samsung.com&gt;
diff --git a/.github/workflows/run-onecc-build.yml b/.github/workflows/run-onecc-build.yml
@@ -45,12 +45,14 @@ jobs:
     strategy:
       matrix:
         type: [ Debug, Release ]
-        ubuntu_code: [ focal, jammy ]
+        ubuntu_code: [ focal, jammy ] #, noble ]
         include:
           - ubuntu_code: focal
             ubuntu_ver: 20.04
           - ubuntu_code: jammy
             ubuntu_ver: 22.04
+          #- ubuntu_code: noble
+          #  ubuntu_ver: 24.04
     runs-on: one-x64-linux
     container:
       image: nnfw/one-devtools:${{ matrix.ubuntu_code }}
@@ -67,9 +69,15 @@ jobs:
       # dalgona uses pybind11, but pybind11 cannot bind packages in virtualenv.
       # So we need to install packages for dalgona-test globally.
       - name: Install required packages
+        if: ${{ matrix.ubuntu_code == 'focal' || matrix.ubuntu_code == 'jammy' }}
         run: |
           python3 -m pip install numpy h5py==3.11.0 flatbuffers==23.5.26
 
+      - name: Install required packages
+        if: ${{ matrix.ubuntu_code == 'noble' }}
+        run: |
+          apt-get install -y python3-numpy python3-h5py python3-flatbuffers
+
       - name: Caching externals
         uses: actions/cache@v4
         with:
@@ -79,7 +87,7 @@ jobs:
             external-onecc-
             external-
 
-      - name: Caching externals
+      - name: Caching overlay
         uses: actions/cache@v4
         with:
           path: ${{ env.NNCC_WORKSPACE }}/overlay
diff --git a/.github/workflows/run-onert-android-build.yml b/.github/workflows/run-onert-android-build.yml
@@ -21,13 +21,6 @@ on:
       - master
       - release/*
     paths:
-      - '.github/workflows/run-onert-android-build.yml'
-      - 'nn*'
-      - 'Makefile.template'
-      - 'infra/buildtool/**'
-      - 'infra/cmake/**'
-      - 'infra/nncc/**'
-      - 'infra/nnfw/**'
       - 'runtime/**'
       - '!runtime/contrib/**'
       - '!**/*.md'
diff --git a/.github/workflows/run-onert-cross-build.yml b/.github/workflows/run-onert-cross-build.yml
@@ -21,13 +21,6 @@ on:
       - master
       - release/*
     paths:
-      - '.github/workflows/run-onert-cross-build.yml'
-      - 'nn*'
-      - 'Makefile.template'
-      - 'infra/buildtool/**'
-      - 'infra/cmake/**'
-      - 'infra/nncc/**'
-      - 'infra/nnfw/**'
       - 'runtime/**'
       - '!runtime/contrib/**'
       - '!**/*.md'
diff --git a/.github/workflows/run-onert-gbs-build.yml b/.github/workflows/run-onert-gbs-build.yml
@@ -24,15 +24,6 @@ on:
       - master
       - release/*
     paths:
-      - '.github/workflows/run-onert-gbs-build.yml'
-      - 'nncc'
-      - 'nnfw'
-      - 'compiler/luci/**'
-      - 'compiler/loco/**'
-      - 'compiler/logo/**'
-      - 'compute/**'
-      - 'infra/nnfw/**'
-      - 'infra/cmake/**'
       - 'runtime/**'
       - '!runtime/contrib/**'
       - 'packaging/**'
diff --git a/.github/workflows/run-onert-native-build.yml b/.github/workflows/run-onert-native-build.yml
@@ -21,13 +21,6 @@ on:
       - master
       - release/*
     paths:
-      - '.github/workflows/run-onert-native-build.yml'
-      - 'nn*'
-      - 'Makefile.template'
-      - 'infra/buildtool/**'
-      - 'infra/cmake/**'
-      - 'infra/nncc/**'
-      - 'infra/nnfw/**'
       - 'runtime/**'
       - '!runtime/contrib/**'
       - '!**/*.md'
diff --git a/compiler/CMakeLists.txt b/compiler/CMakeLists.txt
@@ -3,7 +3,7 @@
 set(ONE_UBUNTU_CODENAME "focal")
 find_program(LSB_RELEASE_EXEC lsb_release)
 if(LSB_RELEASE_EXEC)
-  # output should be one of 'bionic', 'focal', 'jammy'
+  # output should be one of 'bionic', 'focal', 'jammy', 'noble'
   # others are not tested
   execute_process(COMMAND "${LSB_RELEASE_EXEC}" --short --codename
                   OUTPUT_VARIABLE ONE_UBUNTU_CODENAME
@@ -14,6 +14,10 @@ endif()
 
 if(${ONE_UBUNTU_CODENAME} STREQUAL "bionic")
   set(ONE_UBUNTU_CODENAME_BIONIC TRUE)
+elseif(${ONE_UBUNTU_CODENAME} STREQUAL "focal")
+  set(ONE_UBUNTU_CODENAME_FOCAL TRUE)
+elseif(${ONE_UBUNTU_CODENAME} STREQUAL "jammy")
+  set(ONE_UBUNTU_CODENAME_JAMMY TRUE)
 elseif(${ONE_UBUNTU_CODENAME} STREQUAL "noble")
   set(ONE_UBUNTU_CODENAME_NOBLE TRUE)
 endif()
diff --git a/compiler/common-artifacts/CMakeLists.txt b/compiler/common-artifacts/CMakeLists.txt
@@ -25,10 +25,10 @@ else()
   endif()
 
   # tensorflow 2.12.1 supports Python 3.8 ~ 3.11
-  if(Python_VERSION VERSION_GREATER_EQUAL 3.12)
-    message(STATUS "Build common-artifacts: FALSE (Python version 3.12 or higher is not supported yet)")
-    return()
-  endif()
+  #if(Python_VERSION VERSION_GREATER_EQUAL 3.12)
+  #  message(STATUS "Build common-artifacts: FALSE (Python version 3.12 or higher is not supported yet)")
+  #  return()
+  #endif()
   if(Python_VERSION VERSION_LESS 3.8)
     message(STATUS "Build common-artifacts: FAILED (Install Python version 3.8 or 3.10)")
     return()
@@ -65,46 +65,53 @@ if(DEFINED ENV{ONE_PIP_OPTION_TRUST_HOST})
   set(PIP_OPTION_TRUSTED_HOST --trusted-host pypi.python.org --trusted-host files.pythonhosted.org --trusted-host pypi.org)
 endif()
 
+set(PY_PKG_LIST )
 if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "aarch64")
-  # NOTE `tensorflow-cpu` package is not available for aarch64, so we use `tensorflow` package.
-  add_custom_command(
-    OUTPUT ${REQUIREMENTS_OVERLAY_PATH_TF_2_12_1}
-    COMMAND ${CMAKE_COMMAND} -E remove -f ${REQUIREMENTS_OVERLAY_PATH_TF_2_12_1}
-    COMMAND ${CMAKE_COMMAND} -E echo "tensorflow==2.12.1" >> ${REQUIREMENTS_OVERLAY_PATH_TF_2_12_1}
-    COMMAND ${CMAKE_COMMAND} -E echo "flatbuffers==23.5.26" >> ${REQUIREMENTS_OVERLAY_PATH_TF_2_12_1}
-    COMMAND ${CMAKE_COMMAND} -E echo "protobuf==4.23.3" >> ${REQUIREMENTS_OVERLAY_PATH_TF_2_12_1}
-    COMMAND ${CMAKE_COMMAND} -E echo "pydot==1.4.2" >> ${REQUIREMENTS_OVERLAY_PATH_TF_2_12_1}
-    COMMAND ${CMAKE_COMMAND} -E echo "pytest==7.4.3" >> ${REQUIREMENTS_OVERLAY_PATH_TF_2_12_1}
-    COMMAND ${CMAKE_COMMAND} -E echo "h5py==3.11.0" >> ${REQUIREMENTS_OVERLAY_PATH_TF_2_12_1}
-    COMMAND ${CMAKE_COMMAND} -E echo "cffi==1.16.0" >> ${REQUIREMENTS_OVERLAY_PATH_TF_2_12_1}
-    COMMAND ${VIRTUALENV_OVERLAY_TF_2_12_1}/bin/${PYTHON_OVERLAY} -m pip --default-timeout=1000
-            ${PIP_OPTION_TRUSTED_HOST} install --upgrade pip setuptools
-    COMMAND ${VIRTUALENV_OVERLAY_TF_2_12_1}/bin/${PYTHON_OVERLAY} -m pip --default-timeout=1000
-            ${PIP_OPTION_TRUSTED_HOST} install -r ${REQUIREMENTS_OVERLAY_PATH_TF_2_12_1} --upgrade
-    DEPENDS ${VIRTUALENV_OVERLAY_TF_2_12_1}
-  )
+  list(APPEND PY_PKG_LIST "tensorflow==2.12.1")
+  list(APPEND PY_PKG_LIST "flatbuffers==23.5.26")
+  list(APPEND PY_PKG_LIST "protobuf==4.23.3")
+  list(APPEND PY_PKG_LIST "pydot==1.4.2")
+  list(APPEND PY_PKG_LIST "pytest==7.4.3")
+  list(APPEND PY_PKG_LIST "h5py==3.11.0")
+  list(APPEND PY_PKG_LIST "cffi==1.16.0")
 else(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "aarch64")
+  list(APPEND PY_PKG_LIST "tensorflow==2.12.1")
+  list(APPEND PY_PKG_LIST "flatbuffers==23.5.26")
+  list(APPEND PY_PKG_LIST "protobuf==4.23.3")
+  list(APPEND PY_PKG_LIST "pydot==1.4.2")
+  list(APPEND PY_PKG_LIST "pytest==7.4.3")
+  list(APPEND PY_PKG_LIST "h5py==3.11.0")
+  list(APPEND PY_PKG_LIST "cffi==1.16.0")
+endif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "aarch64")
+
+add_custom_command(
+  OUTPUT REQUIREMENTS_OVERLAY_PATH_TF_2_12_1_clean
+  COMMAND ${CMAKE_COMMAND} -E remove -f ${REQUIREMENTS_OVERLAY_PATH_TF_2_12_1}
+  DEPENDS ${VIRTUALENV_OVERLAY_TF_2_12_1}
+)
+
+set(PY_PKG_LIST_DEPENDS_PREV REQUIREMENTS_OVERLAY_PATH_TF_2_12_1_clean)
+foreach(PKG_VER IN LISTS PY_PKG_LIST)
+  message(STATUS "!!! ${PKG_VER}")
   add_custom_command(
-    OUTPUT ${REQUIREMENTS_OVERLAY_PATH_TF_2_12_1}
-    COMMAND ${CMAKE_COMMAND} -E remove -f ${REQUIREMENTS_OVERLAY_PATH_TF_2_12_1}
-    COMMAND ${CMAKE_COMMAND} -E echo "tensorflow-cpu==2.12.1" >> ${REQUIREMENTS_OVERLAY_PATH_TF_2_12_1}
-    COMMAND ${CMAKE_COMMAND} -E echo "flatbuffers==23.5.26" >> ${REQUIREMENTS_OVERLAY_PATH_TF_2_12_1}
-    COMMAND ${CMAKE_COMMAND} -E echo "protobuf==4.23.3" >> ${REQUIREMENTS_OVERLAY_PATH_TF_2_12_1}
-    COMMAND ${CMAKE_COMMAND} -E echo "pydot==1.4.2" >> ${REQUIREMENTS_OVERLAY_PATH_TF_2_12_1}
-    COMMAND ${CMAKE_COMMAND} -E echo "pytest==7.4.3" >> ${REQUIREMENTS_OVERLAY_PATH_TF_2_12_1}
-    COMMAND ${CMAKE_COMMAND} -E echo "h5py==3.11.0" >> ${REQUIREMENTS_OVERLAY_PATH_TF_2_12_1}
-    COMMAND ${CMAKE_COMMAND} -E echo "cffi==1.16.0" >> ${REQUIREMENTS_OVERLAY_PATH_TF_2_12_1}
-    COMMAND ${VIRTUALENV_OVERLAY_TF_2_12_1}/bin/${PYTHON_OVERLAY} -m pip --default-timeout=1000
-            ${PIP_OPTION_TRUSTED_HOST} install --upgrade pip setuptools
-    COMMAND ${VIRTUALENV_OVERLAY_TF_2_12_1}/bin/${PYTHON_OVERLAY} -m pip --default-timeout=1000
-            ${PIP_OPTION_TRUSTED_HOST} install -r ${REQUIREMENTS_OVERLAY_PATH_TF_2_12_1} --upgrade
-    DEPENDS ${VIRTUALENV_OVERLAY_TF_2_12_1}
+    OUTPUT ${PKG_VER}_item
+    COMMAND ${CMAKE_COMMAND} -E echo "${PKG_VER}" >> ${REQUIREMENTS_OVERLAY_PATH_TF_2_12_1}
+    DEPENDS ${VIRTUALENV_OVERLAY_TF_2_12_1} ${PY_PKG_LIST_DEPENDS_PREV}
   )
-endif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "aarch64")
+  set(PY_PKG_LIST_DEPENDS_PREV ${PKG_VER}_item)
+endforeach()
+
+add_custom_command(
+  OUTPUT VIRTUALENV_OVERLAY_TF_2_12_1_installed
+  COMMAND ${VIRTUALENV_OVERLAY_TF_2_12_1}/bin/${PYTHON_OVERLAY} -m pip --default-timeout=1000
+          ${PIP_OPTION_TRUSTED_HOST} install --upgrade pip setuptools
+  COMMAND ${VIRTUALENV_OVERLAY_TF_2_12_1}/bin/${PYTHON_OVERLAY} -m pip --default-timeout=1000
+          ${PIP_OPTION_TRUSTED_HOST} install -r ${REQUIREMENTS_OVERLAY_PATH_TF_2_12_1} --upgrade
+  DEPENDS ${VIRTUALENV_OVERLAY_TF_2_12_1} ${PY_PKG_LIST_DEPENDS_PREV}
+)
 
 add_custom_target(common_artifacts_python_deps ALL
-  DEPENDS ${VIRTUALENV_OVERLAY_TF_2_12_1}
-          ${REQUIREMENTS_OVERLAY_PATH_TF_2_12_1}
+  DEPENDS VIRTUALENV_OVERLAY_TF_2_12_1_installed
 )
 
 #[[ Generate common resources ]]
diff --git a/compiler/dalgona/CMakeLists.txt b/compiler/dalgona/CMakeLists.txt
@@ -2,7 +2,7 @@
 #   Ubuntu18.04; explictly installed python3.8 (default is python3.6)
 #   Ubuntu20.04; default python3.8
 #   Ubuntu22.04; default python3.10
-#   Ubuntu24.04; explictly installed python3.8 (default is python3.12)
+#   Ubuntu24.04; default python3.12
 #   refer https://github.com/Samsung/ONE/issues/9962
 if(CMAKE_VERSION VERSION_LESS 3.12)
   find_package(PythonInterp 3.8 QUIET)
diff --git a/compiler/fm-equalize-value-py-test/CMakeLists.txt b/compiler/fm-equalize-value-py-test/CMakeLists.txt
@@ -1,3 +1,6 @@
+message(STATUS "SKIP fm-equalize")
+return()
+
 if(NOT ENABLE_TEST)
   return()
 endif(NOT ENABLE_TEST)
diff --git a/compiler/mir/CMakeLists.txt b/compiler/mir/CMakeLists.txt
@@ -29,7 +29,8 @@ set(MIR_SOURCES
 add_library(mir STATIC ${MIR_SOURCES})
 target_include_directories(mir PUBLIC include)
 target_link_libraries(mir PUBLIC adtidas)
-target_link_libraries(mir PRIVATE nncc_common)
+# to prevent _GLIBCXX17_DEPRECATED warning as error
+# target_link_libraries(mir PRIVATE nncc_common)
 target_link_libraries(mir PUBLIC nncc_coverage)
 
 set_target_properties(mir PROPERTIES POSITION_INDEPENDENT_CODE ON)
diff --git a/compiler/mir/src/mir_caffe2_importer/CMakeLists.txt b/compiler/mir/src/mir_caffe2_importer/CMakeLists.txt
@@ -25,4 +25,6 @@ set(MIR_CAFFE2_IMPORTER_SOURCES
 add_library(mir_caffe2_importer STATIC ${MIR_CAFFE2_IMPORTER_SOURCES})
 set_target_properties(mir_caffe2_importer PROPERTIES POSITION_INDEPENDENT_CODE ON)
 target_include_directories(mir_caffe2_importer PUBLIC ../../include/mir_caffe2_importer)
-target_link_libraries(mir_caffe2_importer PUBLIC mir PRIVATE caffe2proto nncc_common)
+target_link_libraries(mir_caffe2_importer PUBLIC mir PRIVATE caffe2proto)
+# to prevent _GLIBCXX17_DEPRECATED warning as error
+# target_link_libraries(mir_caffe2_importer PRIVATE nncc_common)
diff --git a/compiler/mir/src/mir_caffe_importer/CMakeLists.txt b/compiler/mir/src/mir_caffe_importer/CMakeLists.txt
@@ -13,4 +13,6 @@ set(MIR_CAFFE_IMPORTER_SOURCES
 add_library(mir_caffe_importer STATIC ${MIR_CAFFE_IMPORTER_SOURCES})
 set_target_properties(mir_caffe_importer PROPERTIES POSITION_INDEPENDENT_CODE ON)
 target_include_directories(mir_caffe_importer PUBLIC ../../include/mir_caffe_importer)
-target_link_libraries(mir_caffe_importer PUBLIC mir PRIVATE caffeproto nncc_common)
+target_link_libraries(mir_caffe_importer PUBLIC mir PRIVATE caffeproto)
+# to prevent _GLIBCXX17_DEPRECATED warning as error
+# target_link_libraries(mir_caffe_importer PRIVATE nncc_common)
diff --git a/compiler/mir/src/mir_onnx_importer/CMakeLists.txt b/compiler/mir/src/mir_onnx_importer/CMakeLists.txt
@@ -116,7 +116,9 @@ add_library(mir_onnx_importer STATIC ${MIR_ONNX_IMPORTER_SOURCES})
 set_target_properties(mir_onnx_importer PROPERTIES POSITION_INDEPENDENT_CODE ON)
 target_include_directories(mir_onnx_importer PUBLIC ../../include/mir_onnx_importer)
 target_include_directories(mir_onnx_importer PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
-target_link_libraries(mir_onnx_importer PUBLIC mir mir_onnx_proto PRIVATE mir_interpreter nncc_common)
+target_link_libraries(mir_onnx_importer PUBLIC mir mir_onnx_proto PRIVATE mir_interpreter)
+# to prevent _GLIBCXX17_DEPRECATED warning as error
+# target_link_libraries(mir_onnx_importer PRIVATE nncc_common)
 
 if(NOT ENABLE_TEST)
   return()
diff --git a/compiler/mir/src/mir_tflite_importer/CMakeLists.txt b/compiler/mir/src/mir_tflite_importer/CMakeLists.txt
@@ -18,4 +18,6 @@ set(MIR_TFLITE_IMPORTER_SOURCES
 add_library(mir_tflite_importer STATIC ${MIR_TFLITE_IMPORTER_SOURCES})
 set_target_properties(mir_tflite_importer PROPERTIES POSITION_INDEPENDENT_CODE ON)
 target_include_directories(mir_tflite_importer PUBLIC ../../include/mir_tflite_importer)
-target_link_libraries(mir_tflite_importer PUBLIC mir PRIVATE mir_tflite_schema nncc_common)
+target_link_libraries(mir_tflite_importer PUBLIC mir PRIVATE mir_tflite_schema)
+# to prevent _GLIBCXX17_DEPRECATED warning as error
+# target_link_libraries(mir_tflite_importer PUBLIC mir PRIVATE nncc_common)
diff --git a/compiler/nnc/cmake/utils.cmake b/compiler/nnc/cmake/utils.cmake
@@ -41,7 +41,8 @@ endfunction()
 # add nnc library as target
 function(nnc_add_library)
   add_library(${ARGV})
-  target_link_libraries(${ARGV0} PRIVATE nncc_common)
+  # to prevent _GLIBCXX17_DEPRECATED warning as error
+  # target_link_libraries(${ARGV0} PRIVATE nncc_common)
   target_link_libraries(${ARGV0} PUBLIC nncc_coverage)
 
   get_target_property(LIBS ${NNC_TARGET_EXECUTABLE} LINK_LIBRARIES)
diff --git a/compiler/one-cmds/CMakeLists.txt b/compiler/one-cmds/CMakeLists.txt
@@ -2,7 +2,7 @@
 #   Ubuntu18.04; explictly installed python3.8 (default is python3.6)
 #   Ubuntu20.04; default python3.8
 #   Ubuntu22.04; default python3.10
-#   Ubuntu24.04; explicitly installed python3.8 (default is python3.12)
+#   Ubuntu24.04; default python3.12
 #   refer https://github.com/Samsung/ONE/issues/9962
 if(CMAKE_VERSION VERSION_LESS 3.12)
   find_package(PythonInterp 3.8 QUIET)
@@ -24,10 +24,10 @@ else()
   endif()
 
   # tensorflow 2.12.1 supports Python 3.8 ~ 3.11
-  if(Python_VERSION VERSION_GREATER_EQUAL 3.12)
-    message(STATUS "Build one-cmds: FALSE (Python version 3.12 or higher is not supported yet)")
-    return()
-  endif()
+  #if(Python_VERSION VERSION_GREATER_EQUAL 3.12)
+  #  message(STATUS "Build one-cmds: FALSE (Python version 3.12 or higher is not supported yet)")
+  #  return()
+  #endif()
   if(Python_VERSION VERSION_LESS 3.8)
     message(STATUS "Build one-cmds: FAILED (Install Python version 3.8 or 3.10)")
     return()
diff --git a/compiler/one-cmds/one-import-onnx b/compiler/one-cmds/one-import-onnx
@@ -24,7 +24,13 @@ import os
 import sys
 import tempfile
 import onnx
-import onnx_tf
+
+# onnx_tf may not exist for latest python
+try:
+    import onnx_tf
+    _onnx_tf_enabled = True
+except ImportError:
+    _onnx_tf_enabled = False
 
 # ONNX legalizer is an optional feature
 # It enables conversion of some operations, but in experimental phase for now
@@ -124,6 +130,10 @@ class TidyIONames:
                 self.onnx_model.graph.output[i].name = self.remap_outputs[idx]
 
 
+def _check_onnx_tf():
+    import onnx
+
+
 def get_driver_cfg_section():
     return "one-import-onnx"
 
@@ -330,6 +340,9 @@ def _convert(args):
             if _force_ext(args):
                 run_default_import = False
 
+        if not _onnx_tf_enabled:
+            run_default_import = False
+
         res_conv = -1
         if run_default_import:
             if _force_ext(args):
diff --git a/compiler/one-cmds/one-prepare-venv.u2404 b/compiler/one-cmds/one-prepare-venv.u2404
diff --git a/infra/nncc/CMakeLists.txt b/infra/nncc/CMakeLists.txt
