Skip to content

Commit debf8fc

Browse files
committed
Adding unit test for vulkan initiation
Changes to be committed: modified: .github/workflows/cmake-test.yml modified: CMakeLists.txt renamed: inc/ae2fVK/README.md -> inc/ae2fVK/Ann/README.md modified: src/ann/Slp.def.cc modified: src/vk/Slp.def.cc new file: src/vk/Slp.glsl modified: test.sh modified: test/vk/SlpInit-Primal.c
1 parent c859f5f commit debf8fc

File tree

8 files changed

+328
-63
lines changed

8 files changed

+328
-63
lines changed

.github/workflows/cmake-test.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,9 @@ jobs:
5757
- name: setupclang-win
5858
if: matrix.c == '-DCMAKE_C_COMPILER=clang' && matrix.os == 'windows-11-arm' || matrix.os == 'windows-latest'
5959
uses: egor-tensin/setup-clang@v1
60-
60+
61+
- name: Install Vulkan SDK
62+
uses: jakoch/[email protected]
6163

6264
- name: Test
6365
run: ${{ matrix.bash }} ./test.sh ${{ matrix.c }} ${{ matrix.cc }} ${{ matrix.conf }}

CMakeLists.txt

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
cmake_minimum_required(VERSION 3.20)
22
enable_testing()
33
option(ae2f_CXX "" ON)
4-
option(ae2fVK_needed "" OFF)
4+
option(ae2fVK_needed "" ON)
55
option(ae2f_TEST "" ON)
66
option(ae2f_MAC_BUILD "" ON)
77
option(ae2f_IS_SHARED "" OFF)
8-
option(ae2f_DEVEL "" OFF)
8+
option(ae2f_DEVEL "" ON)
99

1010
include(cmake/Core.cmake)
1111

@@ -65,7 +65,7 @@ if(NOT TARGET ae2f::Ann)
6565
ae2f_CoreTestTent(${ae2f__Ann__TENT} "test/ann")
6666
endif()
6767

68-
if(ae2fVK_needed AND NOT TARGET ae2fVK::Ann)
68+
if(NOT TARGET ae2fVK::Ann)
6969
ae2f_CoreLibFetchX(ae2f VK-Core main)
7070
file(GLOB AnnVK-inc ${PROJECT_SOURCE_DIR}/inc/ae2fVK/Ann/*.h)
7171

@@ -84,6 +84,17 @@ if(ae2fVK_needed AND NOT TARGET ae2fVK::Ann)
8484
${AnnVK-inc} ${AnnVK-src}
8585
)
8686

87+
ae2f_Inc_init(100 100 100 ON ON ON)
88+
ae2f_Macro_one(
89+
${PROJECT_SOURCE_DIR}/src/vk/Slp.glsl
90+
${PROJECT_SOURCE_DIR}/src/vk/Slp.auto.i.glsl
91+
)
92+
ae2f_Inc_Run_One(
93+
${PROJECT_SOURCE_DIR}/src/vk/Slp.auto.i.glsl
94+
${PROJECT_SOURCE_DIR}/src/vk/Slp.auto.glsl
95+
)
96+
97+
8798
add_library(ae2fVK::Ann ALIAS ${ae2fVK__VK-Ann__TENT})
8899
add_library(ae2f::VK-Ann ALIAS ${ae2fVK__VK-Ann__TENT})
89100

File renamed without changes.

src/ann/Slp.def.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,7 @@ ae2f_MAC() _ae2f_AnnSlpMk(
558558
ae2f_float_t learningrate_bias,
559559

560560
ae2f_opt ae2f_err_t* const err_opt
561-
)
561+
)
562562
{
563563
if((err_opt) && *(err_opt))
564564
;

0 commit comments

Comments
 (0)