Skip to content

Commit 635a4c1

Browse files
just some update for the setup
1 parent 7cb1098 commit 635a4c1

File tree

7 files changed

+28
-6
lines changed

7 files changed

+28
-6
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ add_subdirectory(3D)
2626
add_subdirectory(image)
2727
add_subdirectory(discrete)
2828
add_subdirectory(NN)
29-
find_package(openMP REQUIRED)
29+
find_package(OpenMP REQUIRED)

CMakePresets.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
"CMAKE_BUILD_TYPE": "Release",
1515
"CMAKE_C_COMPILER": "clang",
1616
"CMAKE_CXX_COMPILER": "clang++",
17-
"CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
17+
"CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
18+
"VCPKG_TARGET_TRIPLET": "x64-windows-release"
1819
}
1920
}
2021
]

NN/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
add_subdirectory(FFN)
22

3-
find_package(vulkan REQUIRED true)
3+
find_package(Vulkan MODULE REQUIRED) # paksa cari via FindVulkan.cmake

NN/FFN/dynFFN/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/../Utility/include)
1+
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/../../Utility/include)
2+
3+
add_executable(dynFFN ${CMAKE_CURRENT_SOURCE_DIR}/src/dynFFN.cxx)

NN/FFN/dynFFN/include/ffn.hxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#pragma once
22
#include <omp.h>
33

4+
#include <nn_objects.hxx>
45
#include <random>
56
#include <type_traits>
67
#include <vector>
78

8-
#include "nn_objects.hxx"
99

1010
namespace NN {
1111

NN/FFN/dynFFN/src/dynFFN.cxx

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#include <ffn.hxx>
2+
#include <nn_objects.hxx>
3+
4+
int main() {
5+
size_t layer_sizes[] = {1, 1024, 1024, 1};
6+
ACTIVATION_TYPE act_funcs[] = {ACTIVATION_TYPE::NONE, ACTIVATION_TYPE::ReLU, ACTIVATION_TYPE::tanh};
7+
FFN<double> ffn(layer_sizes, act_funcs);
8+
return 0;
9+
}

vcpkg.json

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,17 @@
11
{
2+
"name": "cpp-playground",
3+
"version": "0.1.0",
24
"dependencies": [
35
"libpng",
46
"zlib",
5-
"vulkan"
7+
"vulkan",
8+
{
9+
"name": "llvm",
10+
"features": [
11+
"clang",
12+
"lld",
13+
"openmp"
14+
]
15+
}
616
]
717
}

0 commit comments

Comments
 (0)