Skip to content

Commit f8cc0f7

Browse files
committed
DRAFT compiler support U24.04
on-going draft with compiler support U24.04 Signed-off-by: SaeHie Park <[email protected]>
1 parent 95b9a2a commit f8cc0f7

File tree

46 files changed

+219
-155
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+219
-155
lines changed

.github/workflows/run-onecc-build.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,14 @@ jobs:
4545
strategy:
4646
matrix:
4747
type: [ Debug, Release ]
48-
ubuntu_code: [ focal, jammy ]
48+
ubuntu_code: [ focal, jammy, noble ]
4949
include:
5050
- ubuntu_code: focal
5151
ubuntu_ver: 20.04
5252
- ubuntu_code: jammy
5353
ubuntu_ver: 22.04
54+
- ubuntu_code: noble
55+
ubuntu_ver: 24.04
5456
runs-on: one-x64-linux
5557
container:
5658
image: nnfw/one-devtools:${{ matrix.ubuntu_code }}
@@ -67,9 +69,15 @@ jobs:
6769
# dalgona uses pybind11, but pybind11 cannot bind packages in virtualenv.
6870
# So we need to install packages for dalgona-test globally.
6971
- name: Install required packages
72+
if: ${{ matrix.ubuntu_code == 'focal' || matrix.ubuntu_code == 'jammy' }}
7073
run: |
7174
python3 -m pip install numpy h5py==3.11.0 flatbuffers==23.5.26
7275
76+
- name: Install required packages
77+
if: ${{ matrix.ubuntu_code == 'noble' }}
78+
run: |
79+
apt-get install -y python3-numpy python3-h5py python3-flatbuffers
80+
7381
- name: Caching externals
7482
uses: actions/cache@v4
7583
with:
@@ -79,7 +87,7 @@ jobs:
7987
external-onecc-
8088
external-
8189
82-
- name: Caching externals
90+
- name: Caching overlay
8391
uses: actions/cache@v4
8492
with:
8593
path: ${{ env.NNCC_WORKSPACE }}/overlay

.github/workflows/run-onert-android-build.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,6 @@ on:
2121
- master
2222
- release/*
2323
paths:
24-
- '.github/workflows/run-onert-android-build.yml'
25-
- 'nn*'
26-
- 'Makefile.template'
27-
- 'infra/buildtool/**'
28-
- 'infra/cmake/**'
29-
- 'infra/nncc/**'
30-
- 'infra/nnfw/**'
3124
- 'runtime/**'
3225
- '!runtime/contrib/**'
3326
- '!**/*.md'

.github/workflows/run-onert-cross-build.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,6 @@ on:
2121
- master
2222
- release/*
2323
paths:
24-
- '.github/workflows/run-onert-build.yml'
25-
- 'nn*'
26-
- 'Makefile.template'
27-
- 'infra/buildtool/**'
28-
- 'infra/cmake/**'
29-
- 'infra/nncc/**'
30-
- 'infra/nnfw/**'
3124
- 'runtime/**'
3225
- '!runtime/contrib/**'
3326
- '!**/*.md'

.github/workflows/run-onert-gbs-build.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,6 @@ on:
2424
- master
2525
- release/*
2626
paths:
27-
- '.github/workflows/run-onert-gbs-build.yml'
28-
- 'nncc'
29-
- 'nnfw'
30-
- 'compiler/luci/**'
31-
- 'compiler/loco/**'
32-
- 'compiler/logo/**'
33-
- 'compute/**'
34-
- 'infra/nnfw/**'
35-
- 'infra/cmake/**'
3627
- 'runtime/**'
3728
- '!runtime/contrib/**'
3829
- 'packaging/**'

.github/workflows/run-onert-native-build.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,6 @@ on:
2121
- master
2222
- release/*
2323
paths:
24-
- '.github/workflows/run-onert-build.yml'
25-
- 'nn*'
26-
- 'Makefile.template'
27-
- 'infra/buildtool/**'
28-
- 'infra/cmake/**'
29-
- 'infra/nncc/**'
30-
- 'infra/nnfw/**'
3124
- 'runtime/**'
3225
- '!runtime/contrib/**'
3326
- '!**/*.md'

compiler/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
set(ONE_UBUNTU_CODENAME "focal")
44
find_program(LSB_RELEASE_EXEC lsb_release)
55
if(LSB_RELEASE_EXEC)
6-
# output should be one of 'bionic', 'focal', 'jammy'
6+
# output should be one of 'bionic', 'focal', 'jammy', 'noble'
77
# others are not tested
88
execute_process(COMMAND "${LSB_RELEASE_EXEC}" --short --codename
99
OUTPUT_VARIABLE ONE_UBUNTU_CODENAME

compiler/circle-interpreter-cffi-test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ if(NOT ENABLE_TEST)
22
return()
33
endif(NOT ENABLE_TEST)
44

5-
set(VIRTUALENV "${NNCC_OVERLAY_DIR}/venv_2_12_1")
5+
set(VIRTUALENV "${NNCC_OVERLAY_DIR}/venv_2_19_0")
66
set(TEST_LIST_FILE "test.lst")
77

88
get_target_property(ARTIFACTS_PATH testDataGenerator BINARY_DIR)

compiler/circle-part-value-py-test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ endforeach(IDX)
9898
add_custom_target(circle_part_value_py_test_prepare ALL DEPENDS ${TEST_DEPS})
9999
add_dependencies(circle_part_value_py_test_prepare common_artifacts_deps)
100100

101-
set(VIRTUALENV "${NNCC_OVERLAY_DIR}/venv_2_12_1")
101+
set(VIRTUALENV "${NNCC_OVERLAY_DIR}/venv_2_19_0")
102102
set(TEST_LIST_FILE "test.lst")
103103

104104
add_test(NAME circle_part_value_py_test

compiler/circle-part-value-test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ add_dependencies(circle_part_value_test_prepare common_artifacts_deps)
107107
add_test(NAME circle_part_value_test
108108
COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/part_eval_all.sh"
109109
"${CMAKE_CURRENT_BINARY_DIR}"
110-
"${NNCC_OVERLAY_DIR}/venv_2_12_1"
110+
"${NNCC_OVERLAY_DIR}/venv_2_19_0"
111111
"$<TARGET_FILE:circle_part_driver>"
112112
${PARTITION_LIST}
113113
)

compiler/coco/core/include/coco/IR/Op.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include "coco/IR/Part.h"
2828
#include "coco/IR/Entity.h"
2929

30+
#include <cstdint>
3031
#include <set>
3132

3233
#include <stdexcept>

0 commit comments

Comments
 (0)