DRAFT compiler support U24.04

seanshpark · seanshpark · commit 1a73ef1557cf · 2025-05-08T15:18:37.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: samsungonedev.azurecr.io/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:
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
@@ -103,8 +103,22 @@ elseif (PYTHON_VERSION_MINOR EQUAL 10)
   list(APPEND PY_PKG_LIST "h5py==3.11.0")
   list(APPEND PY_PKG_LIST "cffi==1.16.0")
   list(APPEND PY_PKG_LIST "numpy==1.26.4")
+elseif (PYTHON_VERSION_MINOR EQUAL 12)
+  # python 3.12; Ubuntu 24.04
+  # TF2.19.0 release at 2025-03-12
+  if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "aarch64")
+    list(APPEND PY_PKG_LIST "tensorflow==2.19.0")
+  else(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "aarch64")
+    list(APPEND PY_PKG_LIST "tensorflow-cpu==2.19.0")
+  endif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "aarch64")
+  list(APPEND PY_PKG_LIST "flatbuffers==24.3.25")
+  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")
+  list(APPEND PY_PKG_LIST "numpy==1.26.4")
 else()
-  # TODO add for 12
   # should not enter here
   message(FATAL_ERROR "Build common-artifacts: FAILED (Invalid pyhon version)")
 endif()
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
@@ -26,19 +26,19 @@ VENV_PYTHON=${DRIVER_PATH}/venv/bin/python
 
 if [ ! -f ${VENV_ACTIVATE} ]; then
   # Create python virtual enviornment
-  python3.8 -m venv "${DRIVER_PATH}/venv"
+  python3 -m venv "${DRIVER_PATH}/venv"
 fi
 
 # NOTE version
 # - https://github.com/onnx/onnx/blob/master/docs/Versioning.md
 # - https://github.com/onnx/onnx-tensorflow/blob/master/Versioning.md
 
-VER_TENSORFLOW=2.12.1
-VER_ONNX=1.16.0
-VER_ONNXRUNTIME=1.18.0
-VER_ONNX_TF=1.10.0
+VER_TENSORFLOW=2.19.0 # 2025-03-12
+VER_ONNX=1.17.0
+VER_ONNXRUNTIME=1.20.1
+#VER_ONNX_TF=1.10.0
 VER_PYDOT=1.4.2
-VER_TORCH="2.1.2+cpu"
+VER_TORCH="2.6.0+cpu"
 
 # Install tensorflow
 
@@ -66,8 +66,8 @@ else
 fi
 ${VENV_PYTHON} -m pip ${PIP_OPTIONS} install Pillow
 # Fix version to that of TF release date
-${VENV_PYTHON} -m pip ${PIP_OPTIONS} install tensorflow_probability==0.20.1
-${VENV_PYTHON} -m pip ${PIP_OPTIONS} install tensorflow_addons==0.20.0
+#${VENV_PYTHON} -m pip ${PIP_OPTIONS} install tensorflow_probability==0.25.0
+#${VENV_PYTHON} -m pip ${PIP_OPTIONS} install tensorflow_addons==0.23.0
 
 # Install PyTorch and ONNX related
 # NOTE set ONE_PREPVENV_TORCH_SOURCE to override options for source URL.
@@ -84,14 +84,14 @@ ${VENV_PYTHON} -m pip ${PIP_OPTIONS} install onnx==${VER_ONNX}
 ${VENV_PYTHON} -m pip ${PIP_OPTIONS} install onnxruntime==${VER_ONNXRUNTIME}
 
 # Provide install of custom onnx-tf
-if [ -n "${EXT_ONNX_TF_WHL}" ]; then
-  ${VENV_PYTHON} -m pip ${PIP_OPTIONS} install ${EXT_ONNX_TF_WHL}
-else
-  ${VENV_PYTHON} -m pip ${PIP_OPTIONS} install onnx-tf==${VER_ONNX_TF}
-fi
+#if [ -n "${EXT_ONNX_TF_WHL}" ]; then
+#  ${VENV_PYTHON} -m pip ${PIP_OPTIONS} install ${EXT_ONNX_TF_WHL}
+#else
+#  ${VENV_PYTHON} -m pip ${PIP_OPTIONS} install onnx-tf==${VER_ONNX_TF}
+#fi
 
 # Fix version to that of TF release date
-${VENV_PYTHON} -m pip ${PIP_OPTIONS} install --upgrade protobuf==4.23.3
+${VENV_PYTHON} -m pip ${PIP_OPTIONS} install --upgrade protobuf==5.29.4
 
 # Install pydot for visq
 ${VENV_PYTHON} -m pip ${PIP_OPTIONS} install pydot==${VER_PYDOT}
diff --git a/infra/nncc/CMakeLists.txt b/infra/nncc/CMakeLists.txt
@@ -116,8 +116,7 @@ include("cmake/ApplyCompileFlags.cmake")
 ###
 add_library(nncc_common INTERFACE)
 if(ENABLE_STRICT_BUILD)
-  # TODO Remove -Wno-overloaded-virtual
-  target_compile_options(nncc_common INTERFACE -Werror -Wall -Wextra -Wno-overloaded-virtual)
+  target_compile_options(nncc_common INTERFACE -Werror -Wall -Wextra)
 endif(ENABLE_STRICT_BUILD)
 
 add_library(nncc_coverage INTERFACE)
