From 2723df02a3c17ff81d3609fdffd79a967550011a Mon Sep 17 00:00:00 2001 From: aliPMPAINT Date: Wed, 31 Mar 2021 10:32:03 +0430 Subject: [PATCH 1/9] Added x86_64 builds --- .github/workflows/cpp_linux_x86_64.yml | 77 ++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 .github/workflows/cpp_linux_x86_64.yml diff --git a/.github/workflows/cpp_linux_x86_64.yml b/.github/workflows/cpp_linux_x86_64.yml new file mode 100644 index 000000000..63a0e121c --- /dev/null +++ b/.github/workflows/cpp_linux_x86_64.yml @@ -0,0 +1,77 @@ +name: linux_x86_64 release + +on: [release] + +jobs: + deb-rpm-x86_64-build: + + runs-on: ubuntu-18.04 + container: axsauze/kompute-builder:0.2 + + steps: + - uses: actions/checkout@v2 + + # Storing the release version, needed to determine the name of the built packages + - name: Get version + run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV + + # For glslang, there are no packages on Ubuntu's(less than 20.04) official repository, so we use Debian's package + - name: installing dependencies + run: | + echo "deb http://deb.debian.org/debian sid main" | tee /etc/apt/sources.list + apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138 + apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 04EE7237B7D453EC + apt update + apt-get install -t sid glslang-dev -y + apt-get install libfmt-dev -y + apt-get install libspdlog-dev -y + apt-get install libvulkan-dev -y + + - name: configure-cpp + run: | + cmake -Bbuild/ \ + -DCMAKE_BUILD_TYPE=Release \ + -DKOMPUTE_OPT_INSTALL=1 \ + -DKOMPUTE_OPT_ENABLE_SPDLOG=1 + + - name: build-cpp + run: | + cd build && make install DESTDIR=install + + - name: build-deb + uses: bpicode/github-action-fpm@master + with: + fpm_args: 'usr/local/include usr/local/lib' + fpm_opts: '--debug -n kompute -v ${{ env.RELEASE_VERSION }} -t deb -s dir -C ./build/install -d "libvulkan-dev >= 1.1.0" -d "libfmt-dev > 0" -d "libspdlog-dev > 0" -d "glslang-dev >= 11.0.0"' + + - name: Get the debian package name + run: DEB_NAME=$(ls *.deb) && echo "DEB_NAME=$DEB_NAME" >> $GITHUB_ENV + + - name: build-rpm + uses: bpicode/github-action-fpm@master + with: + fpm_args: 'usr/local/include usr/local/lib' + fpm_opts: '--debug -n kompute -v ${{ env.RELEASE_VERSION }} -t rpm -s dir -C ./build/install -d "vulkan-headers >= 1.1.0" -d "fmt > 0" -d "spdlog > 0" -d "glslang >= 11.0.0"' + + - name: Get the rpm package name + run: RPM_NAME=$(ls *.rpm) && echo "RPM_NAME=$RPM_NAME" >> $GITHUB_ENV + + - name: Upload deb to release + uses: svenstaro/upload-release-action@v2 + with: + repo_token: ${{ secrets.GITHUB_TOKEN }} + file: ${{ env.DEB_NAME }} + asset_name: ${{ env.DEB_NAME }} + tag: ${{ github.ref }} + overwrite: true + body: "This is my release text" + + - name: Upload rpm to release + uses: svenstaro/upload-release-action@v2 + with: + repo_token: ${{ secrets.GITHUB_TOKEN }} + file: ${{ env.RPM_NAME }} + asset_name: ${{ env.RPM_NAME }} + tag: ${{ github.ref }} + overwrite: true + body: "This is my release text" From 9664ba9afe890410371a75a2907cb43cca78ed46 Mon Sep 17 00:00:00 2001 From: aliPMPAINT Date: Wed, 31 Mar 2021 10:32:57 +0430 Subject: [PATCH 2/9] Added other arch builds --- .github/workflows/cpp_linux_other_archs.yml | 112 ++++++++++++++++++++ 1 file changed, 112 insertions(+) create mode 100644 .github/workflows/cpp_linux_other_archs.yml diff --git a/.github/workflows/cpp_linux_other_archs.yml b/.github/workflows/cpp_linux_other_archs.yml new file mode 100644 index 000000000..b51dee86b --- /dev/null +++ b/.github/workflows/cpp_linux_other_archs.yml @@ -0,0 +1,112 @@ +name: linux_other_archs release + +on: [release] + +jobs: + build_job: + runs-on: ubuntu-18.04 + name: Build on ${{ matrix.distro }} ${{ matrix.arch }} + + # The used architectures + strategy: + matrix: + include: + - arch: aarch64 + distro: ubuntu18.04 + - arch: armv7 + distro: ubuntu18.04 + + steps: + - uses: actions/checkout@v2 + + # Storing the release version, needed to determine the name of the built packages + # Storing the installation directory, needed to determine where the packages was compiled + - name: Get version and installation directory + run: | + echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV + + - uses: uraimo/run-on-arch-action@v2.0.9 + name: build vulkan-kompute on ${{ matrix.arch }} architecture + id: build + with: + arch: ${{ matrix.arch }} + distro: ${{ matrix.distro }} + + githubToken: ${{ github.token }} + + + setup: | + mkdir -p "${PWD}/archs" + + dockerRunArgs: | + --volume "${PWD}/archs:/archs" + + env: | + artifact_name: ${{ matrix.distro }}_${{ matrix.arch }} + + shell: /bin/sh + + install: | + apt-get update -q -y + apt-get install -q -y gnupg + echo "deb http://deb.debian.org/debian sid main" | tee /etc/apt/sources.list + apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138 + apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 04EE7237B7D453EC + apt-get update -q -y + apt-get install -t sid glslang-dev -y + apt-get install -q -y cmake + apt-get install -q -y g++ + apt-get install -q -y python3 + apt-get install -q -y libfmt-dev -y + apt-get install -q -y libspdlog-dev -y + apt-get install -q -y libvulkan-dev -y + + run: | + cmake -S /home/runner/work/vulkan-kompute/vulkan-kompute -Bbuild/ \ + -DCMAKE_BUILD_TYPE=Release \ + -DKOMPUTE_OPT_INSTALL=1 \ + -DKOMPUTE_OPT_ENABLE_SPDLOG=1 + cd build && make install DESTDIR=/archs/${artifact_name} + + - name: Moving the compiled packages to the current directory + run: | + sudo mv "${PWD}/archs/${{ matrix.distro }}_${{ matrix.arch }}" . + + + - name: build-deb + uses: bpicode/github-action-fpm@master + with: + fpm_args: 'usr/local/include usr/local/lib' + fpm_opts: '--debug -n kompute -v ${{ env.RELEASE_VERSION }} -t deb -s dir -C ./${{ matrix.distro }}_${{ matrix.arch }} -d "libvulkan-dev >= 1.1.0" -d "libfmt-dev > 0" -d "libspdlog-dev > 0" -d "glslang-dev >= 11.0.0"' + + - name: Get the debian package name + run: DEB_NAME=$(ls *.deb) && echo "DEB_NAME=$DEB_NAME" >> $GITHUB_ENV + + - name: build-rpm + uses: bpicode/github-action-fpm@master + with: + fpm_args: 'usr/local/include usr/local/lib' + fpm_opts: '--debug -n kompute -v ${{ env.RELEASE_VERSION }} -t rpm -s dir -C ./${{ matrix.distro }}_${{ matrix.arch }} -d "vulkan-headers >= 1.1.0" -d "fmt > 0" -d "spdlog > 0" -d "glslang >= 11.0.0"' + + - name: Get the rpm package name + run: RPM_NAME=$(ls *.rpm) && echo "RPM_NAME=$RPM_NAME" >> $GITHUB_ENV + + - name: Upload deb to release + uses: svenstaro/upload-release-action@v2 + with: + repo_token: ${{ secrets.GITHUB_TOKEN }} + file: ${{ env.DEB_NAME }} + asset_name: kompute_${{ env.RELEASE_VERSION }}_${{ matrix.arch }}.deb + tag: ${{ github.ref }} + overwrite: true + body: "This is my release text" + + - name: Upload rpm to release + uses: svenstaro/upload-release-action@v2 + with: + repo_token: ${{ secrets.GITHUB_TOKEN }} + file: ${{ env.RPM_NAME }} + asset_name: kompute-${{ env.RELEASE_VERSION }}-${{ matrix.arch }}.rpm + tag: ${{ github.ref }} + overwrite: true + body: "This is my release text" From c8142ed8804084b503047d37600219afb2447c4a Mon Sep 17 00:00:00 2001 From: aliPMPAINT Date: Wed, 31 Mar 2021 10:47:45 +0430 Subject: [PATCH 3/9] fixes #193 issue --- single_include/kompute/Kompute.hpp | 5 +++++ src/CMakeLists.txt | 5 +++++ src/include/kompute/Shader.hpp | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/single_include/kompute/Kompute.hpp b/single_include/kompute/Kompute.hpp index 0093eddc1..d55e3233f 100755 --- a/single_include/kompute/Kompute.hpp +++ b/single_include/kompute/Kompute.hpp @@ -729,7 +729,12 @@ extern py::object kp_debug, kp_info, kp_warning, kp_error; #include #include +#if USE_EXTERNAL_SHADER #include +#else +#include +#endif + #include #include diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c1ab2d3eb..2d0282389 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -145,6 +145,11 @@ endif() #################### GLSLANG ####################### ##################################################### +# If glslag was cloned, then SPIRV/GlslangToSpv.h will be used instead of glslang/SPIRV/GlslangToSpv.h +if(KOMPUTE_OPT_REPO_SUBMODULE_BUILD) + set(USE_EXTERNAL_SHADER 1) +endif() + if(NOT KOMPUTE_OPT_DISABLE_SHADER_UTILS) if(KOMPUTE_OPT_REPO_SUBMODULE_BUILD) add_subdirectory(${PROJECT_SOURCE_DIR}/external/glslang diff --git a/src/include/kompute/Shader.hpp b/src/include/kompute/Shader.hpp index 2cd240424..1e14091ac 100644 --- a/src/include/kompute/Shader.hpp +++ b/src/include/kompute/Shader.hpp @@ -4,7 +4,12 @@ #include #include +#if USE_EXTERNAL_SHADER #include +#else +#include +#endif + #include #include From 2e9239d60e58d723a97c145e1011d552ca98073d Mon Sep 17 00:00:00 2001 From: aliPMPAINT Date: Wed, 31 Mar 2021 11:07:57 +0430 Subject: [PATCH 4/9] adding a definition --- src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2d0282389..cc2799910 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -147,7 +147,7 @@ endif() # If glslag was cloned, then SPIRV/GlslangToSpv.h will be used instead of glslang/SPIRV/GlslangToSpv.h if(KOMPUTE_OPT_REPO_SUBMODULE_BUILD) - set(USE_EXTERNAL_SHADER 1) + add_compile_definitions(USE_EXTERNAL_SHADER=1) endif() if(NOT KOMPUTE_OPT_DISABLE_SHADER_UTILS) From 59a02751e49c5a77fc5f9268bca18581605b73b0 Mon Sep 17 00:00:00 2001 From: aliPMPAINT Date: Wed, 31 Mar 2021 11:19:31 +0430 Subject: [PATCH 5/9] Trying to add it in the first cmakelists --- CMakeLists.txt | 5 +++++ src/CMakeLists.txt | 5 ----- src/include/kompute/Shader.hpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8f23fc622..061883e03 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -88,6 +88,11 @@ if(KOMPUTE_OPT_CODE_COVERAGE) ${CODECOV_DIR}html/) endif() +# If glslag was cloned, then SPIRV/GlslangToSpv.h will be used instead of glslang/SPIRV/GlslangToSpv.h +if(KOMPUTE_OPT_REPO_SUBMODULE_BUILD) + add_compile_definitions(USE_EXTERNAL_GLSLANG) +endif() + # Allow scripts to call main kompute Makefile function(kompute_make KOMPUTE_MAKE_TARGET) add_custom_target(${KOMPUTE_MAKE_TARGET} diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index cc2799910..c1ab2d3eb 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -145,11 +145,6 @@ endif() #################### GLSLANG ####################### ##################################################### -# If glslag was cloned, then SPIRV/GlslangToSpv.h will be used instead of glslang/SPIRV/GlslangToSpv.h -if(KOMPUTE_OPT_REPO_SUBMODULE_BUILD) - add_compile_definitions(USE_EXTERNAL_SHADER=1) -endif() - if(NOT KOMPUTE_OPT_DISABLE_SHADER_UTILS) if(KOMPUTE_OPT_REPO_SUBMODULE_BUILD) add_subdirectory(${PROJECT_SOURCE_DIR}/external/glslang diff --git a/src/include/kompute/Shader.hpp b/src/include/kompute/Shader.hpp index 1e14091ac..d670d63a7 100644 --- a/src/include/kompute/Shader.hpp +++ b/src/include/kompute/Shader.hpp @@ -4,7 +4,7 @@ #include #include -#if USE_EXTERNAL_SHADER +#ifdef USE_EXTERNAL_GLSLANG #include #else #include From 61053d633d8e5f1d84bb31a76d33e1291a498824 Mon Sep 17 00:00:00 2001 From: aliPMPAINT Date: Wed, 31 Mar 2021 11:23:16 +0430 Subject: [PATCH 6/9] Updating Kompute.hpp --- CMakeLists.txt | 2 +- single_include/kompute/Kompute.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 061883e03..0b1fc5ab6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -88,7 +88,7 @@ if(KOMPUTE_OPT_CODE_COVERAGE) ${CODECOV_DIR}html/) endif() -# If glslag was cloned, then SPIRV/GlslangToSpv.h will be used instead of glslang/SPIRV/GlslangToSpv.h +# If glslang was cloned, then SPIRV/GlslangToSpv.h will be used instead of glslang/SPIRV/GlslangToSpv.h if(KOMPUTE_OPT_REPO_SUBMODULE_BUILD) add_compile_definitions(USE_EXTERNAL_GLSLANG) endif() diff --git a/single_include/kompute/Kompute.hpp b/single_include/kompute/Kompute.hpp index d55e3233f..60a85e653 100755 --- a/single_include/kompute/Kompute.hpp +++ b/single_include/kompute/Kompute.hpp @@ -729,7 +729,7 @@ extern py::object kp_debug, kp_info, kp_warning, kp_error; #include #include -#if USE_EXTERNAL_SHADER +#ifdef USE_EXTERNAL_GLSLANG #include #else #include From 34433beabf70f6122b3abb3cce45c8cf9f28b6eb Mon Sep 17 00:00:00 2001 From: aliPMPAINT Date: Wed, 31 Mar 2021 11:28:59 +0430 Subject: [PATCH 7/9] Usinging the more compatible add_definitions(), as add_compile_definitions() is from 3.12 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0b1fc5ab6..11200076b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -90,7 +90,7 @@ endif() # If glslang was cloned, then SPIRV/GlslangToSpv.h will be used instead of glslang/SPIRV/GlslangToSpv.h if(KOMPUTE_OPT_REPO_SUBMODULE_BUILD) - add_compile_definitions(USE_EXTERNAL_GLSLANG) + add_definitions(-DUSE_EXTERNAL_GLSLANG) endif() # Allow scripts to call main kompute Makefile From a22f87a65b429503c2a50e1a3c90da16ca0300f8 Mon Sep 17 00:00:00 2001 From: aliPMPAINT Date: Wed, 31 Mar 2021 11:38:10 +0430 Subject: [PATCH 8/9] removed unrelated files to this PR --- .github/workflows/cpp_linux_other_archs.yml | 112 -------------------- .github/workflows/cpp_linux_x86_64.yml | 77 -------------- 2 files changed, 189 deletions(-) delete mode 100644 .github/workflows/cpp_linux_other_archs.yml delete mode 100644 .github/workflows/cpp_linux_x86_64.yml diff --git a/.github/workflows/cpp_linux_other_archs.yml b/.github/workflows/cpp_linux_other_archs.yml deleted file mode 100644 index b51dee86b..000000000 --- a/.github/workflows/cpp_linux_other_archs.yml +++ /dev/null @@ -1,112 +0,0 @@ -name: linux_other_archs release - -on: [release] - -jobs: - build_job: - runs-on: ubuntu-18.04 - name: Build on ${{ matrix.distro }} ${{ matrix.arch }} - - # The used architectures - strategy: - matrix: - include: - - arch: aarch64 - distro: ubuntu18.04 - - arch: armv7 - distro: ubuntu18.04 - - steps: - - uses: actions/checkout@v2 - - # Storing the release version, needed to determine the name of the built packages - # Storing the installation directory, needed to determine where the packages was compiled - - name: Get version and installation directory - run: | - echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV - - - uses: uraimo/run-on-arch-action@v2.0.9 - name: build vulkan-kompute on ${{ matrix.arch }} architecture - id: build - with: - arch: ${{ matrix.arch }} - distro: ${{ matrix.distro }} - - githubToken: ${{ github.token }} - - - setup: | - mkdir -p "${PWD}/archs" - - dockerRunArgs: | - --volume "${PWD}/archs:/archs" - - env: | - artifact_name: ${{ matrix.distro }}_${{ matrix.arch }} - - shell: /bin/sh - - install: | - apt-get update -q -y - apt-get install -q -y gnupg - echo "deb http://deb.debian.org/debian sid main" | tee /etc/apt/sources.list - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138 - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 04EE7237B7D453EC - apt-get update -q -y - apt-get install -t sid glslang-dev -y - apt-get install -q -y cmake - apt-get install -q -y g++ - apt-get install -q -y python3 - apt-get install -q -y libfmt-dev -y - apt-get install -q -y libspdlog-dev -y - apt-get install -q -y libvulkan-dev -y - - run: | - cmake -S /home/runner/work/vulkan-kompute/vulkan-kompute -Bbuild/ \ - -DCMAKE_BUILD_TYPE=Release \ - -DKOMPUTE_OPT_INSTALL=1 \ - -DKOMPUTE_OPT_ENABLE_SPDLOG=1 - cd build && make install DESTDIR=/archs/${artifact_name} - - - name: Moving the compiled packages to the current directory - run: | - sudo mv "${PWD}/archs/${{ matrix.distro }}_${{ matrix.arch }}" . - - - - name: build-deb - uses: bpicode/github-action-fpm@master - with: - fpm_args: 'usr/local/include usr/local/lib' - fpm_opts: '--debug -n kompute -v ${{ env.RELEASE_VERSION }} -t deb -s dir -C ./${{ matrix.distro }}_${{ matrix.arch }} -d "libvulkan-dev >= 1.1.0" -d "libfmt-dev > 0" -d "libspdlog-dev > 0" -d "glslang-dev >= 11.0.0"' - - - name: Get the debian package name - run: DEB_NAME=$(ls *.deb) && echo "DEB_NAME=$DEB_NAME" >> $GITHUB_ENV - - - name: build-rpm - uses: bpicode/github-action-fpm@master - with: - fpm_args: 'usr/local/include usr/local/lib' - fpm_opts: '--debug -n kompute -v ${{ env.RELEASE_VERSION }} -t rpm -s dir -C ./${{ matrix.distro }}_${{ matrix.arch }} -d "vulkan-headers >= 1.1.0" -d "fmt > 0" -d "spdlog > 0" -d "glslang >= 11.0.0"' - - - name: Get the rpm package name - run: RPM_NAME=$(ls *.rpm) && echo "RPM_NAME=$RPM_NAME" >> $GITHUB_ENV - - - name: Upload deb to release - uses: svenstaro/upload-release-action@v2 - with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - file: ${{ env.DEB_NAME }} - asset_name: kompute_${{ env.RELEASE_VERSION }}_${{ matrix.arch }}.deb - tag: ${{ github.ref }} - overwrite: true - body: "This is my release text" - - - name: Upload rpm to release - uses: svenstaro/upload-release-action@v2 - with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - file: ${{ env.RPM_NAME }} - asset_name: kompute-${{ env.RELEASE_VERSION }}-${{ matrix.arch }}.rpm - tag: ${{ github.ref }} - overwrite: true - body: "This is my release text" diff --git a/.github/workflows/cpp_linux_x86_64.yml b/.github/workflows/cpp_linux_x86_64.yml deleted file mode 100644 index 63a0e121c..000000000 --- a/.github/workflows/cpp_linux_x86_64.yml +++ /dev/null @@ -1,77 +0,0 @@ -name: linux_x86_64 release - -on: [release] - -jobs: - deb-rpm-x86_64-build: - - runs-on: ubuntu-18.04 - container: axsauze/kompute-builder:0.2 - - steps: - - uses: actions/checkout@v2 - - # Storing the release version, needed to determine the name of the built packages - - name: Get version - run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV - - # For glslang, there are no packages on Ubuntu's(less than 20.04) official repository, so we use Debian's package - - name: installing dependencies - run: | - echo "deb http://deb.debian.org/debian sid main" | tee /etc/apt/sources.list - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138 - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 04EE7237B7D453EC - apt update - apt-get install -t sid glslang-dev -y - apt-get install libfmt-dev -y - apt-get install libspdlog-dev -y - apt-get install libvulkan-dev -y - - - name: configure-cpp - run: | - cmake -Bbuild/ \ - -DCMAKE_BUILD_TYPE=Release \ - -DKOMPUTE_OPT_INSTALL=1 \ - -DKOMPUTE_OPT_ENABLE_SPDLOG=1 - - - name: build-cpp - run: | - cd build && make install DESTDIR=install - - - name: build-deb - uses: bpicode/github-action-fpm@master - with: - fpm_args: 'usr/local/include usr/local/lib' - fpm_opts: '--debug -n kompute -v ${{ env.RELEASE_VERSION }} -t deb -s dir -C ./build/install -d "libvulkan-dev >= 1.1.0" -d "libfmt-dev > 0" -d "libspdlog-dev > 0" -d "glslang-dev >= 11.0.0"' - - - name: Get the debian package name - run: DEB_NAME=$(ls *.deb) && echo "DEB_NAME=$DEB_NAME" >> $GITHUB_ENV - - - name: build-rpm - uses: bpicode/github-action-fpm@master - with: - fpm_args: 'usr/local/include usr/local/lib' - fpm_opts: '--debug -n kompute -v ${{ env.RELEASE_VERSION }} -t rpm -s dir -C ./build/install -d "vulkan-headers >= 1.1.0" -d "fmt > 0" -d "spdlog > 0" -d "glslang >= 11.0.0"' - - - name: Get the rpm package name - run: RPM_NAME=$(ls *.rpm) && echo "RPM_NAME=$RPM_NAME" >> $GITHUB_ENV - - - name: Upload deb to release - uses: svenstaro/upload-release-action@v2 - with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - file: ${{ env.DEB_NAME }} - asset_name: ${{ env.DEB_NAME }} - tag: ${{ github.ref }} - overwrite: true - body: "This is my release text" - - - name: Upload rpm to release - uses: svenstaro/upload-release-action@v2 - with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - file: ${{ env.RPM_NAME }} - asset_name: ${{ env.RPM_NAME }} - tag: ${{ github.ref }} - overwrite: true - body: "This is my release text" From 1a05255ca5652d4ce47996feb9d178c131f16d44 Mon Sep 17 00:00:00 2001 From: unexplored test Date: Thu, 1 Apr 2021 18:20:20 +0430 Subject: [PATCH 9/9] more elaboration --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 11200076b..396d21043 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -88,7 +88,8 @@ if(KOMPUTE_OPT_CODE_COVERAGE) ${CODECOV_DIR}html/) endif() -# If glslang was cloned, then SPIRV/GlslangToSpv.h will be used instead of glslang/SPIRV/GlslangToSpv.h +# If glslang is cloned, then SPIRV/GlslangToSpv.h will be used instead of glslang/SPIRV/GlslangToSpv.h +# As after installation, SPIRV/ header files will be found in glslang/SPIRV/ , more info in #193 if(KOMPUTE_OPT_REPO_SUBMODULE_BUILD) add_definitions(-DUSE_EXTERNAL_GLSLANG) endif()