Skip to content

Commit ed98454

Browse files
Add vcpkg manifest
1 parent 2ebccb7 commit ed98454

File tree

2 files changed

+24
-22
lines changed

2 files changed

+24
-22
lines changed

.github/workflows/ci.yaml

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ concurrency:
1212
env:
1313
THREADS: 2
1414
CONFIG: RelWithDebInfo
15-
VCPKG_INSTALL: "vcpkg install alpaka fmt tinyobjloader boost-mp11 boost-atomic boost-smart-ptr boost-functional boost-container boost-iostreams[core] catch2 xsimd"
1615

1716
jobs:
1817
clang-format:
@@ -49,9 +48,6 @@ jobs:
4948
- name: install clang-15
5049
run: |
5150
sudo apt install clang-15 libomp-15-dev clang-tidy-15
52-
- name: vcpkg install dependencies
53-
run: |
54-
eval $VCPKG_INSTALL
5551
- name: cmake
5652
run: |
5753
mkdir build
@@ -83,9 +79,6 @@ jobs:
8379
- name: install lcov
8480
run: |
8581
sudo apt install lcov
86-
- name: vcpkg install dependencies
87-
run: |
88-
eval $VCPKG_INSTALL
8982
- name: cmake
9083
run: |
9184
mkdir build
@@ -122,16 +115,14 @@ jobs:
122115
- uses: actions/checkout@v3
123116
- name: create llama.hpp
124117
run: ./tools/create-single-header.sh
125-
- name: vcpkg install dependencies
126-
run: |
127-
eval $VCPKG_INSTALL
118+
- run: vcpkg install # installs manifest in a folder called `vcpkg_installed` next to the manifest
128119
- name: test llama.hpp
129120
run: |
130121
mkdir build
131122
cd build
132123
mkdir llama
133124
cp -p ../single-header/llama.hpp llama
134-
$CXX -std=c++20 -I$VCPKG_INSTALLATION_ROOT/installed/x64-linux/include -I. ../examples/heatequation/heatequation.cpp
125+
$CXX -std=c++20 -I../vcpkg_installed/x64-linux/include -I. ../examples/heatequation/heatequation.cpp
135126
- name: upload llama.hpp
136127
uses: actions/upload-artifact@v3
137128
with:
@@ -244,11 +235,6 @@ jobs:
244235
if: ${{ matrix.install_extra }}
245236
run: |
246237
sudo apt install ${{ matrix.install_extra }}
247-
- name: vcpkg install dependencies
248-
run: |
249-
# vcpkg fails to build with Intel or nvhpc compilers
250-
if [ ${{ matrix.install_oneapi }} ] || [ ${{ matrix.add_nvcpp_repo }} ]; then unset CXX; fi
251-
eval $VCPKG_INSTALL
252238
- name: download CUDA
253239
if: matrix.cuda_url
254240
run: |
@@ -314,9 +300,6 @@ jobs:
314300

315301
steps:
316302
- uses: actions/checkout@v3
317-
- name: vcpkg install dependencies
318-
run: |
319-
eval $VCPKG_INSTALL
320303
- name: cmake
321304
run: |
322305
mkdir build
@@ -347,9 +330,6 @@ jobs:
347330
run: |
348331
brew install llvm libomp pkg-config
349332
echo "CXX is here: $(brew --prefix llvm)/bin/clang++"
350-
- name: vcpkg install dependencies
351-
run: |
352-
eval $VCPKG_INSTALL
353333
- name: cmake
354334
run: |
355335
mkdir build

vcpkg.json

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json",
3+
"name": "llama",
4+
"version": "0.5.0",
5+
"dependencies": [
6+
"alpaka",
7+
"boost-atomic",
8+
"boost-container",
9+
"boost-core",
10+
"boost-functional",
11+
"boost-mp11",
12+
"boost-smart-ptr",
13+
{
14+
"name": "boost-iostreams",
15+
"default-features": false
16+
},
17+
"catch2",
18+
"fmt",
19+
"tinyobjloader",
20+
"xsimd"
21+
]
22+
}

0 commit comments

Comments
 (0)