Skip to content

Commit

Permalink
Merge pull request #851 from ndellingwood/release-candidate-3.2.1
Browse files Browse the repository at this point in the history
Release candidate 3.2.1
  • Loading branch information
srajama1 authored Nov 25, 2020
2 parents a952807 + 27c24b4 commit 42defc5
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 5 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Change Log

## [3.2.01](https://github.com/kokkos/kokkos-kernels/tree/3.2.01) (2020-11-17)
[Full Changelog](https://github.com/kokkos/kokkos-kernels/compare/3.2.00...3.2.01)

**Fixed bugs:**

- Cpp14 Fixes: [\#790](https://github.com/kokkos/kokkos-kernels/pull/790)

## [3.2.00](https://github.com/kokkos/kokkos-kernels/tree/3.2.00) (2020-08-19)
[Full Changelog](https://github.com/kokkos/kokkos-kernels/compare/3.1.01...3.2.00)

Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ IF(NOT KOKKOSKERNELS_HAS_TRILINOS)
ENDIF()
SET(KokkosKernels_VERSION_MAJOR 3)
SET(KokkosKernels_VERSION_MINOR 2)
SET(KokkosKernels_VERSION_PATCH 0)
SET(KokkosKernels_VERSION_PATCH 1)
ENDIF()

IF(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.12.0")
Expand Down
2 changes: 1 addition & 1 deletion src/batched/KokkosBatched_SetTriangular_Internal.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ namespace KokkosBatched {
const int jdist = j+ dist;
Kokkos::parallel_for
(Kokkos::ThreadVectorRange(member, m),
[&](const int &i) {
[=](const int &i) {
if (i >= jdist)
A[i*as0+j*as1] = alpha;
});
Expand Down
2 changes: 1 addition & 1 deletion unit_test/batched/Test_Batched_TeamVectorSolveUTV.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ namespace Test {
} else {
Kokkos::parallel_for
(Kokkos::TeamVectorRange(member, m*m),
[&](const int &ij) {
[=](const int &ij) {
const int i = ij/m, j = ij%m;
value_type tmp(0);
for (int l=0;l<r;++l)
Expand Down
2 changes: 1 addition & 1 deletion unit_test/batched/Test_Batched_TeamVectorSolveUTV2.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ namespace Test {
} else {
Kokkos::parallel_for
(Kokkos::TeamVectorRange(member, m*m),
[&](const int &ij) {
[=](const int &ij) {
const int i = ij/m, j = ij%m;
value_type tmp(0);
for (int l=0;l<r;++l)
Expand Down
2 changes: 1 addition & 1 deletion unit_test/batched/Test_Batched_TeamVectorUTV.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ namespace Test {
} else {
Kokkos::parallel_for
(Kokkos::TeamVectorRange(member, m*m),
[&](const int &ij) {
[=](const int &ij) {
const int i = ij/m, j = ij%m;
value_type tmp(0);
for (int l=0;l<r;++l)
Expand Down

0 comments on commit 42defc5

Please sign in to comment.