From 2395638e38dbf420f45ace19a02ad4280d660063 Mon Sep 17 00:00:00 2001 From: endingly Date: Tue, 1 Oct 2024 00:48:44 +0800 Subject: [PATCH 1/8] fix cmake preset file and github action config --- .github/workflows/checkin_cicd.yml | 10 ++-------- CMakePresets.json | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/.github/workflows/checkin_cicd.yml b/.github/workflows/checkin_cicd.yml index 12b0770..0a13bdd 100644 --- a/.github/workflows/checkin_cicd.yml +++ b/.github/workflows/checkin_cicd.yml @@ -3,8 +3,6 @@ name: checkin on github on: - push: - branches: [ "main" ] pull_request: branches: [ "main" ] @@ -29,15 +27,11 @@ jobs: - os: windows-latest c_compiler: cl cpp_compiler: cl - cmake_configpreset_name: MSVC_x64_release - cmake_buildpreset_name: msvc_x64_build_release - cmake_testpreset_name: checkin_windows + cmake_workflow_preset_name: cicd_on_windows - os: ubuntu-latest c_compiler: gcc cpp_compiler: g++ - cmake_configpreset_name: linux_gcc_x64_release - cmake_buildpreset_name: linux_x64_build_release - cmake_testpreset_name: checkin_linux + cmake_workflow_preset_name: cicd_on_linux exclude: - os: windows-latest c_compiler: gcc diff --git a/CMakePresets.json b/CMakePresets.json index 43144a1..86647e7 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -119,6 +119,23 @@ "name": "checkin_windows" } ] + }, + { + "name": "cicd_on_linux", + "steps": [ + { + "type": "configure", + "name": "linux_gcc_x64_release" + }, + { + "type": "build", + "name": "linux_x64_build_release" + }, + { + "type": "test", + "name": "checkin_linux" + } + ] } ] } \ No newline at end of file From e9c5d530df57343966b4bd31a1ee6324124c158d Mon Sep 17 00:00:00 2001 From: endingly Date: Tue, 1 Oct 2024 01:00:07 +0800 Subject: [PATCH 2/8] add workflow keyword --- .github/workflows/checkin_cicd.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/checkin_cicd.yml b/.github/workflows/checkin_cicd.yml index 0a13bdd..0693a25 100644 --- a/.github/workflows/checkin_cicd.yml +++ b/.github/workflows/checkin_cicd.yml @@ -53,8 +53,6 @@ jobs: - name: config, build and test uses: lukka/run-cmake@v10.8 with: - configurePreset: ${{ matrix.cmake_preset_name }} - buildPreset: ${{ matrix.cmake_buildpreset_name }} - testPreset: ${{ matrix.cmake_testpreset_name }} + workflowPreset: ${{ matrix.cmake_workflow_preset_name }} env: VCPKG_ROOT: ${{ runner.workspace }}/vcpkg From 7149f0c767d76907570a6569c89c6e615f979001 Mon Sep 17 00:00:00 2001 From: endingly Date: Tue, 1 Oct 2024 01:08:50 +0800 Subject: [PATCH 3/8] update github action file --- .github/workflows/checkin_cicd.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/checkin_cicd.yml b/.github/workflows/checkin_cicd.yml index 0693a25..4c6e4a6 100644 --- a/.github/workflows/checkin_cicd.yml +++ b/.github/workflows/checkin_cicd.yml @@ -44,6 +44,9 @@ jobs: - name: checkout repository uses: actions/checkout@v4 + - name: set up ninja + uses: ashutoshvarma/setup-ninja@v1.1 + - name: set up vcpkg uses: lukka/run-vcpkg@v11.2 with: From 8e16e1b4d55367971a5e58874d9bc61ce2b0c96d Mon Sep 17 00:00:00 2001 From: endingly Date: Tue, 1 Oct 2024 01:18:14 +0800 Subject: [PATCH 4/8] remove cutlass dep --- vcpkg.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/vcpkg.json b/vcpkg.json index d3382b7..21a7d02 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -10,10 +10,6 @@ "gtest", "fmt", "units", - "eigen3", - { - "name": "nvidia-cutlass", - "platform": "native" - } + "eigen3" ] } \ No newline at end of file From 018a13e8bfdc1ef4fb343ab7963269cb669e9cda Mon Sep 17 00:00:00 2001 From: endingly Date: Tue, 1 Oct 2024 09:28:41 +0800 Subject: [PATCH 5/8] fix some bug --- CMakePresets.json | 4 ++-- submod/core/include/units_extend.hpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakePresets.json b/CMakePresets.json index 86647e7..a9e3a2b 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -3,7 +3,7 @@ "configurePresets": [ { "name": "linux_gcc_x64_debug", - "displayName": "GCC 13.2.0 x86_64-linux-gnu debug mode", + "displayName": "GCC x86_64-linux-gnu debug mode", "binaryDir": "${sourceDir}/out/build/${presetName}", "generator": "Ninja", "cacheVariables": { @@ -17,7 +17,7 @@ }, { "name": "linux_gcc_x64_release", - "displayName": "GCC 13.2.0 x86_64-linux-gnu release mode", + "displayName": "GCC x86_64-linux-gnu release mode", "binaryDir": "${sourceDir}/out/build/${presetName}", "generator": "Ninja", "cacheVariables": { diff --git a/submod/core/include/units_extend.hpp b/submod/core/include/units_extend.hpp index d55ef1e..8026d94 100644 --- a/submod/core/include/units_extend.hpp +++ b/submod/core/include/units_extend.hpp @@ -1,6 +1,6 @@ #pragma once #include - +#include #include namespace units::extend { From 448a692f70957aed24bd0645b6de79a98d9dd334 Mon Sep 17 00:00:00 2001 From: endingly Date: Tue, 1 Oct 2024 09:36:16 +0800 Subject: [PATCH 6/8] Update checkin_cicd.yml --- .github/workflows/checkin_cicd.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/checkin_cicd.yml b/.github/workflows/checkin_cicd.yml index 4c6e4a6..7bef463 100644 --- a/.github/workflows/checkin_cicd.yml +++ b/.github/workflows/checkin_cicd.yml @@ -47,6 +47,9 @@ jobs: - name: set up ninja uses: ashutoshvarma/setup-ninja@v1.1 + - name: set up gcc latest + uses: egor-tensin/setup-gcc@v1.3 + - name: set up vcpkg uses: lukka/run-vcpkg@v11.2 with: From 9803ec3fd51f3fdf8202a9b3f8bd9a083b6f6c32 Mon Sep 17 00:00:00 2001 From: endingly Date: Tue, 1 Oct 2024 09:40:10 +0800 Subject: [PATCH 7/8] fix error of github action file --- .github/workflows/checkin_cicd.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/checkin_cicd.yml b/.github/workflows/checkin_cicd.yml index 7bef463..40a105a 100644 --- a/.github/workflows/checkin_cicd.yml +++ b/.github/workflows/checkin_cicd.yml @@ -20,7 +20,7 @@ jobs: # # To add more build types (Release, Debug, RelWithDebInfo, etc.) customize the build_type list. matrix: - os: [ubuntu-latest, windows-latest] + os: [ubuntu-24.04, windows-latest] build_type: [Release] c_compiler: [gcc, cl] include: @@ -47,9 +47,6 @@ jobs: - name: set up ninja uses: ashutoshvarma/setup-ninja@v1.1 - - name: set up gcc latest - uses: egor-tensin/setup-gcc@v1.3 - - name: set up vcpkg uses: lukka/run-vcpkg@v11.2 with: From 27acc423b3109e119070e6dad0b2dd2c6bd056ac Mon Sep 17 00:00:00 2001 From: endingly Date: Tue, 1 Oct 2024 09:44:34 +0800 Subject: [PATCH 8/8] update github yml --- .github/workflows/checkin_cicd.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/checkin_cicd.yml b/.github/workflows/checkin_cicd.yml index 40a105a..5691e2d 100644 --- a/.github/workflows/checkin_cicd.yml +++ b/.github/workflows/checkin_cicd.yml @@ -28,7 +28,7 @@ jobs: c_compiler: cl cpp_compiler: cl cmake_workflow_preset_name: cicd_on_windows - - os: ubuntu-latest + - os: ubuntu-24.04 c_compiler: gcc cpp_compiler: g++ cmake_workflow_preset_name: cicd_on_linux @@ -37,7 +37,7 @@ jobs: c_compiler: gcc - os: windows-latest c_compiler: clang - - os: ubuntu-latest + - os: ubuntu-24.04 c_compiler: cl steps: