Unverified Commit 5e1f9f53 authored by Bolea Sanchez, Vicente Adolfo's avatar Bolea Sanchez, Vicente Adolfo Committed by GitHub
Browse files

Merge pull request #3685 from vicentebolea/backports_release_29 

Backports for release_29
parents 12c4319e ce731768

docs/requirements.txt

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ certifi==2022.12.7 
cffi==1.15.1

charset-normalizer==2.1.1

colorama==0.4.6

cryptography==39.0.1

cryptography==41.0.0

docutils==0.17

funcparserlib==1.0.1

idna==3.4

scripts/ci/cmake-v2/ci-ascent-common.cmake

0 → 100644
+6 −0
Original line number Diff line number Diff line 
# Client maintainer: vicente.bolea@kitware.com



set(CTEST_TEST_ARGS

  PARALLEL_LEVEL 8

  EXCLUDE ".*/BPWRCUDA.ADIOS2BPCUDAWrong/.*BP4.Serial|.*/BPWRCUDA.ADIOS2BPCUDAMemSel/.*BP4.Serial|Engine.Staging.TestThreads.*|Install.*"

  )

scripts/ci/cmake-v2/ci-ascent-cuda.cmake

+1 −4
Original line number Diff line number Diff line
@@ -18,10 +18,7 @@ CMAKE_DISABLE_FIND_PACKAGE_FLEX=ON 
CMAKE_Fortran_FLAGS:STRING=-Wall

")



set(CTEST_TEST_ARGS

  PARALLEL_LEVEL 8

  EXCLUDE ".*/BPWRCUDA.ADIOS2BPCUDAWrong/.*BP4.Serial|.*/BPWRCUDA.ADIOS2BPCUDAMemSel/.*BP4.Serial"

  )

set(CTEST_CMAKE_GENERATOR "Ninja")

list(APPEND CTEST_UPDATE_NOTES_FILES "${CMAKE_CURRENT_LIST_FILE}")

include(${CMAKE_CURRENT_LIST_DIR}/ci-ascent-common.cmake)

include(${CMAKE_CURRENT_LIST_DIR}/ci-common.cmake)

scripts/ci/cmake-v2/ci-ascent-kokkos-cuda.cmake

+1 −4
Original line number Diff line number Diff line
@@ -23,10 +23,7 @@ CMAKE_DISABLE_FIND_PACKAGE_BISON=ON 
CMAKE_DISABLE_FIND_PACKAGE_FLEX=ON

")



set(CTEST_TEST_ARGS

  PARALLEL_LEVEL 8

  EXCLUDE ".*/BPWRCUDA.ADIOS2BPCUDAWrong/.*BP4.Serial|.*/BPWRCUDA.ADIOS2BPCUDAMemSel/.*BP4.Serial|Engine.Staging.TestThreads.*"

  )

set(CTEST_CMAKE_GENERATOR "Ninja")

list(APPEND CTEST_UPDATE_NOTES_FILES "${CMAKE_CURRENT_LIST_FILE}")

include(${CMAKE_CURRENT_LIST_DIR}/ci-ascent-common.cmake)

include(${CMAKE_CURRENT_LIST_DIR}/ci-common.cmake)

scripts/ci/cmake-v2/ci-ascent-nvhpc.cmake

+1 −4
Original line number Diff line number Diff line
@@ -21,10 +21,7 @@ CMAKE_DISABLE_FIND_PACKAGE_FLEX=ON 
CMAKE_NINJA_FORCE_RESPONSE_FILE=OFF

")



set(CTEST_TEST_ARGS

  PARALLEL_LEVEL 8

  EXCLUDE ".*/BPWRCUDA.ADIOS2BPCUDAWrong/.*BP4.Serial|.*/BPWRCUDA.ADIOS2BPCUDAMemSel/.*BP4.Serial|Install.*Fortran"

  )

set(CTEST_CMAKE_GENERATOR "Unix Makefiles")

list(APPEND CTEST_UPDATE_NOTES_FILES "${CMAKE_CURRENT_LIST_FILE}")

include(${CMAKE_CURRENT_LIST_DIR}/ci-ascent-common.cmake)

include(${CMAKE_CURRENT_LIST_DIR}/ci-common.cmake)