Skip to content

Commit

Permalink
Remove use of pika::for_loop from permutations (#945)
Browse files Browse the repository at this point in the history
  • Loading branch information
msimberg authored Sep 21, 2023
1 parent f18f533 commit 3548c54
Show file tree
Hide file tree
Showing 7 changed files with 265 additions and 177 deletions.
3 changes: 1 addition & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,7 @@ else()
endif()

# ----- pika
find_package(pika 0.17.0 REQUIRED)
find_package(pika-algorithms 0.1.1 REQUIRED)
find_package(pika 0.18.0 REQUIRED)

# ----- BLASPP/LAPACKPP
find_package(blaspp REQUIRED)
Expand Down
2 changes: 1 addition & 1 deletion ci/.gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ stages:
stage: build
timeout: 6 hours
variables:
SPACK_SHA: 566754440f9dfed9accd25db7f1a67b0cd074fcd
SPACK_SHA: 4429e17db053fcf7ec591ce3abe8ffc7733c0a25
SPACK_DLAF_REPO: ./spack
before_script:
- !reference [.fetch-registry-tokens, script]
Expand Down
2 changes: 1 addition & 1 deletion ci/docker/release-cpu-stdexec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spack:
true

specs:
- dla-future@master +miniapps +ci-test +ci-check-threads ^intel-mkl threads=openmp ^mpich ^pika+stdexec ^[email protected]=main
- dla-future@master +miniapps +ci-test +ci-check-threads ^intel-mkl threads=openmp ^mpich ^pika +stdexec ^[email protected]=main

packages:
all:
Expand Down
1 change: 0 additions & 1 deletion cmake/template/DLAFConfig.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ endif()

# ----- pika
find_dependency(pika PATHS @pika_DIR@)
find_dependency(pika-algorithms PATHS @pika-algorithms_DIR@)

# ----- BLASPP/LAPACKPP
find_dependency(blaspp PATHS @blaspp_DIR@)
Expand Down
428 changes: 259 additions & 169 deletions include/dlaf/permutations/general/impl.h

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions spack/packages/dla-future/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@ class DlaFuture(CMakePackage, CudaPackage, ROCmPackage):
depends_on("[email protected]:", when="@0.1")
depends_on("[email protected]:", when="@0.2.0")
depends_on("[email protected]:", when="@0.2.1:")
depends_on("[email protected]:")
depends_on("[email protected]:", when="@master")
depends_on("[email protected]:", when="@:0.2")
depends_on("pika +mpi")
depends_on("pika +cuda", when="+cuda")
depends_on("pika +rocm", when="+rocm")
Expand Down Expand Up @@ -114,7 +115,7 @@ class DlaFuture(CMakePackage, CudaPackage, ROCmPackage):

for cxxstd in cxxstds:
depends_on("pika cxxstd={0}".format(cxxstd), when="cxxstd={0}".format(cxxstd))
depends_on("pika-algorithms cxxstd={0}".format(cxxstd), when="cxxstd={0}".format(cxxstd))
depends_on("pika-algorithms cxxstd={0}".format(cxxstd), when="@:0.2 cxxstd={0}".format(cxxstd))

variant("ci-test", default=False, description="Build for CI (Advanced usage).")
conflicts("~miniapps", when="+ci-test")
Expand Down
1 change: 0 additions & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ target_link_libraries(
DLAF::LAPACK
$<$<BOOL:${DLAF_WITH_SCALAPACK}>:DLAF::SCALAPACK>
pika::pika
pika-algorithms::pika_algorithms
lapackpp
blaspp
umpire
Expand Down

0 comments on commit 3548c54

Please sign in to comment.