Skip to content

Commit bf76a9b

Browse files
author
Mathieu Lobet
committed
fix CI and more
1 parent ebe9b4e commit bf76a9b

File tree

6 files changed

+70
-38
lines changed

6 files changed

+70
-38
lines changed

.github/workflows/courses.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
changes:
1515
runs-on: ubuntu-latest
1616
outputs:
17-
output1: ${{ steps.filter.outputs.beginner }}
17+
beginner_changed: ${{ steps.filter.outputs.beginner }}
1818
steps:
1919
- uses: actions/checkout@v4
2020
- uses: dorny/paths-filter@v3
@@ -27,7 +27,7 @@ jobs:
2727
2828
build_beginner_course:
2929
needs: changes
30-
if: ${{ needs.changes.outputs.beginner == 'true' }}
30+
if: ${{ needs.changes.outputs.beginner_changed == 'true' }}
3131
runs-on: ubuntu-latest
3232
steps:
3333
- name: Set up Git repository

.github/workflows/exercises.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
changes:
1515
runs-on: ubuntu-latest
1616
outputs:
17-
output1: ${{ steps.filter.outputs.workflows }}
17+
exercises_changed: ${{ steps.filter.outputs.exercises }}
1818
steps:
1919
- uses: actions/checkout@v4
2020
- uses: dorny/paths-filter@v3
@@ -31,7 +31,7 @@ jobs:
3131
build_kokkos:
3232
runs-on: ubuntu-latest
3333
needs: [changes]
34-
if: ${{ needs.changes.outputs.exercises == 'true' }}
34+
if: ${{ needs.changes.outputs.exercises_changed == 'true' }}
3535
steps:
3636
- name: Set up Git repository
3737
uses: actions/checkout@v4

.github/workflows/projects.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
changes:
1515
runs-on: ubuntu-latest
1616
outputs:
17-
output1: ${{ steps.filter.outputs.workflows }}
17+
projects_changed: ${{ steps.filter.outputs.wave }}
1818
steps:
1919
- uses: actions/checkout@v4
2020
- uses: dorny/paths-filter@v3
@@ -48,7 +48,7 @@ jobs:
4848
build_wave_projects:
4949
runs-on: ubuntu-latest
5050
needs: [build_kokkos, changes]
51-
if: ${{ needs.changes.outputs.wave == 'true' }}
51+
if: ${{ needs.changes.outputs.projects_changed == 'true' }}
5252
steps:
5353
- name: Set up Git repository
5454
uses: actions/checkout@v4

courses/01_beginners/main.tex

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1380,7 +1380,7 @@ \section{Basic concepts of Kokkos}
13801380
13811381
\begin{itemize}
13821382
\item \texttt{ExecutionSpace} is an optional template parameter that specifies the execution space, by default the execution space is \texttt{DefaultExecutionSpace}.
1383-
\item \texttt{start\_index} and \texttt{end\_index} are the beginning and end of the loop
1383+
\item \texttt{start\_index} and \texttt{end\_index} are the beginning and the end of the loop
13841384
\end{itemize}
13851385
13861386
\small
@@ -1469,6 +1469,24 @@ \section{Basic concepts of Kokkos}
14691469
14701470
% _____________________________________________________________________________
14711471
1472+
\begin{frame}[fragile]
1473+
\frametitle{Nested parallel loops}
1474+
1475+
\begin{minted}{C++}
1476+
1477+
Kokkos::View<int**> my_matrix("matrix", Nx, Ny);
1478+
1479+
for (int i = 0; i < Nx; i++) {
1480+
for (int j = 0; j < Ny; j++) {
1481+
my_matrix(i,j) = i + j;
1482+
}
1483+
}
1484+
\end{minted}
1485+
1486+
\end{frame}
1487+
1488+
% _____________________________________________________________________________
1489+
14721490
\begin{frame}[fragile]
14731491
\frametitle{Nested parallel loops}
14741492
@@ -1523,7 +1541,7 @@ \section{Basic concepts of Kokkos}
15231541
15241542
\begin{itemize}
15251543
\item Parallel reduction is the second loop pattern provided by Kokkos: \highlight{Kokkos::parallel\_reduce}
1526-
\item It is often used to compute from an array a single value (sum, max, min, etc.)
1544+
\item It is often used to compute a single value from an array (sum, max, min, etc.)
15271545
\item It works like the \texttt{parallel\_for} loop pattern but with an additional argument: the reducer operation to perform \highlight{Kokkos::Reducer\_op<type>}
15281546
\item \texttt{KOKKOS\_LAMBDA} also has an additional argument: a reference to the local result
15291547
\end{itemize}
@@ -1588,11 +1606,11 @@ \section{Basic concepts of Kokkos}
15881606
15891607
\footnotesize
15901608
\begin{minted}{C++}
1591-
Kokkos::parallel_reduce("my_reduction", N,
1592-
KOKKOS_LAMBDA(int i, double& local_result) {
1593-
local_result += A(i);
1594-
}, result);
1595-
\end{minted}
1609+
Kokkos::parallel_reduce("my_reduction", N,
1610+
KOKKOS_LAMBDA(int i, double& local_result) {
1611+
local_result += A(i);
1612+
}, result);
1613+
\end{minted}
15961614
15971615
\end{frame}
15981616
@@ -1663,7 +1681,7 @@ \section{Basic concepts of Kokkos}
16631681
\end{itemize}
16641682
16651683
\begin{block}{}
1666-
Go to the exercise \texttt{06\_parallel\_reduce} and follow the instructions in the README file
1684+
Go to the exercise \href{https://github.com/CExA-project/cexa-kokkos-tutorials/tree/main/exercises/06_parallel_reduce}{06\_parallel\_reduce} and follow the instructions in the README file
16671685
\end{block}
16681686
16691687
\end{frame}

images/french_super_computers.png

-3.4 KB
Loading

images/french_super_computers.svg

Lines changed: 38 additions & 24 deletions
Loading

0 commit comments

Comments
 (0)