Skip to content

Commit 6beea10

Browse files
committed
Move Git submodule
1 parent dc4e34a commit 6beea10

File tree

14 files changed

+17
-17
lines changed

14 files changed

+17
-17
lines changed

.gitmodules

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[submodule "exercises/vendor/kokkos"]
2-
path = exercises/vendor/kokkos
1+
[submodule "vendor/kokkos"]
2+
path = vendor/kokkos
33
url = https://github.com/kokkos/kokkos
44
branch = master
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ endif()
2828
# find Kokkos as an existing source directory
2929
set(
3030
CexaKokkosTutorials_KOKKOS_SOURCE_DIR
31-
"${CMAKE_CURRENT_SOURCE_DIR}/../../vendor/kokkos"
31+
"${CMAKE_CURRENT_SOURCE_DIR}/../../../vendor/kokkos"
3232
CACHE
3333
PATH
3434
"Path to the local source directory of Kokkos"

exercises/00_compiling_kokkos/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ mv kokkos-4.5.01 kokkos
3030

3131
### Use the submodule
3232

33-
The `../vendor/kokkos` directory contains Kokkos as a Git submodule.
34-
If you haven't cloned the repository recursively, you can get it with:
33+
The `../../../vendor/kokkos` directory contains Kokkos as a Git submodule.
34+
If you haven't cloned the repository recursively already, you can get it with:
3535

3636
```sh
3737
git submodule update --init
@@ -40,7 +40,7 @@ git submodule update --init
4040
Then you create a link here:
4141

4242
```sh
43-
ln -s ../vendor/kokkos kokkos
43+
ln -s ../../../vendor/kokkos kokkos
4444
```
4545

4646
## Step 2: Build Kokkos with default parameters
@@ -51,7 +51,7 @@ This way, you can easily clean up the build directory without affecting the sour
5151
To create a build directory and build Kokkos with default parameters, you can use the following commands:
5252

5353
```bash
54-
cmake -B build_serial -DCMAKE_INSTALL_PREFIX=${PWD}/install_default kokkos
54+
cmake -B build_serial -DCMAKE_INSTALL_PREFIX=${PWD}/install_serial kokkos
5555
cmake --build build_serial
5656
cmake --install build_serial
5757
```

exercises/01_first_program/exercise/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 3.21)
22

33
project(01FirstProgramExercise LANGUAGES CXX)
44

5-
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/modules")
5+
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake/modules")
66

77
find_package(Kokkos REQUIRED)
88

exercises/01_first_program/solution/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 3.21)
22

33
project(01FirstProgramSolution LANGUAGES CXX)
44

5-
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/modules")
5+
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake/modules")
66

77
find_package(Kokkos REQUIRED)
88

exercises/02_basic_view/exercise/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 3.21)
22

33
project(02BasicViewExercise LANGUAGES CXX)
44

5-
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/modules")
5+
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake/modules")
66

77
find_package(Kokkos REQUIRED)
88

exercises/02_basic_view/solution/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 3.21)
22

33
project(02BasicViewSolution LANGUAGES CXX)
44

5-
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/modules")
5+
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake/modules")
66

77
find_package(Kokkos REQUIRED)
88

exercises/03_deep_copy/exercise/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 3.21)
22

33
project(03DeepCopyExercise LANGUAGES CXX)
44

5-
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/modules")
5+
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake/modules")
66

77
find_package(Kokkos REQUIRED)
88

exercises/03_deep_copy/solution/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 3.21)
22

33
project(03DeepCopySolution LANGUAGES CXX)
44

5-
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/modules")
5+
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake/modules")
66

77
find_package(Kokkos REQUIRED)
88

exercises/04_parallel_loop/exercise/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 3.21)
22

33
project(04ParallelLoopExercise LANGUAGES CXX)
44

5-
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/modules")
5+
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake/modules")
66

77
find_package(Kokkos REQUIRED)
88

0 commit comments

Comments
 (0)