Skip to content

Commit 52943b6

Browse files
ye-luoye-luo
committed
Rename Platforms/OpenMP to Platforms/OMPTarget.
1 parent 664595b commit 52943b6

28 files changed

+32
-32
lines changed

‎src/Estimators/tests/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ SET(SRCS test_accumulator.cpp test_local_energy_est.cpp EstimatorManagerBaseTest
2222
ADD_EXECUTABLE(${UTEST_EXE} ${SRCS})
2323
TARGET_LINK_LIBRARIES(${UTEST_EXE} catch_main qmcestimators_unit)
2424
IF(USE_OBJECT_TARGET)
25-
TARGET_LINK_LIBRARIES(${UTEST_EXE} qmcestimators_unit qmcham_unit qmcwfs qmcparticle qmcutil containers platform_omp)
25+
TARGET_LINK_LIBRARIES(${UTEST_EXE} qmcestimators_unit qmcham_unit qmcwfs qmcparticle qmcutil containers platform_omptarget)
2626
ENDIF()
2727

2828
ADD_UNIT_TEST(${UTEST_NAME} "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
@@ -34,7 +34,7 @@ IF(HAVE_MPI)
3434
SET(SRCS EstimatorManagerNewTest.cpp test_manager_mpi.cpp)
3535
ADD_EXECUTABLE(${UTEST_EXE} ${SRCS})
3636
IF(USE_OBJECT_TARGET)
37-
TARGET_LINK_LIBRARIES(${UTEST_EXE} qmcestimators_unit qmcham_unit qmcdriver_unit qmcwfs qmcparticle qmcutil containers platform_omp)
37+
TARGET_LINK_LIBRARIES(${UTEST_EXE} qmcestimators_unit qmcham_unit qmcdriver_unit qmcwfs qmcparticle qmcutil containers platform_omptarget)
3838
ENDIF()
3939
TARGET_LINK_LIBRARIES(${UTEST_EXE} catch_main qmcestimators_unit)
4040
# Right now the unified driver mpi tests are hard coded for 3 MPI ranks

‎src/Particle/RealSpacePositionsOMP.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
#include "Particle/DynamicCoordinates.h"
1919
#include "OhmmsSoA/VectorSoaContainer.h"
20-
#include "OpenMP/OMPallocator.hpp"
20+
#include "OMPTarget/OMPallocator.hpp"
2121
#include "Platforms/PinnedAllocator.h"
2222

2323
namespace qmcplusplus

‎src/Particle/SoaDistanceTableABOMP.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#ifndef QMCPLUSPLUS_DTDIMPL_AB_OMP_H
1414
#define QMCPLUSPLUS_DTDIMPL_AB_OMP_H
1515

16-
#include "OpenMP/OMPallocator.hpp"
16+
#include "OMPTarget/OMPallocator.hpp"
1717
#include "Platforms/PinnedAllocator.h"
1818
#include "Particle/RealSpacePositionsOMP.h"
1919

‎src/Platforms/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ TARGET_LINK_LIBRARIES(platform_device PUBLIC message)
3434
SUBDIRS(CPU)
3535
TARGET_LINK_LIBRARIES(platform_device PUBLIC platform_cpu)
3636

37-
SUBDIRS(OpenMP)
38-
TARGET_LINK_LIBRARIES(platform_device PRIVATE platform_omp)
37+
SUBDIRS(OMPTarget)
38+
TARGET_LINK_LIBRARIES(platform_device PRIVATE platform_omptarget)
3939

4040
IF(QMC_CUDA)
4141
SUBDIRS(CUDA_legacy)

‎src/Platforms/OpenMP/CMakeLists.txt ‎src/Platforms/OMPTarget/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ SET(OMP_SRCS
1515
)
1616

1717
IF(USE_OBJECT_TARGET)
18-
ADD_LIBRARY(platform_omp OBJECT ${OMP_SRCS})
18+
ADD_LIBRARY(platform_omptarget OBJECT ${OMP_SRCS})
1919
ELSE()
20-
ADD_LIBRARY(platform_omp ${OMP_SRCS})
20+
ADD_LIBRARY(platform_omptarget ${OMP_SRCS})
2121
ENDIF()
2222

2323
IF(NOT QMC_COMPLEX)
24-
TARGET_COMPILE_DEFINITIONS(platform_omp PRIVATE -DOPENMP_NO_COMPLEX)
24+
TARGET_COMPILE_DEFINITIONS(platform_omptarget PRIVATE -DOPENMP_NO_COMPLEX)
2525
ENDIF()

‎src/Platforms/OpenMP/OMPallocator.hpp ‎src/Platforms/OMPTarget/OMPallocator.hpp

File renamed without changes.

‎src/Platforms/OpenMP/OMPstd.hpp ‎src/Platforms/OMPTarget/OMPstd.hpp

File renamed without changes.

‎src/Platforms/OpenMP/ompBLAS.cpp ‎src/Platforms/OMPTarget/ompBLAS.cpp

File renamed without changes.

‎src/Platforms/OpenMP/ompBLAS.hpp ‎src/Platforms/OMPTarget/ompBLAS.hpp

File renamed without changes.

‎src/Platforms/OpenMP/ompReduction.hpp ‎src/Platforms/OMPTarget/ompReduction.hpp

File renamed without changes.

‎src/Platforms/tests/OpenMP/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ SET(UTEST_EXE test_${SRC_DIR})
1919
SET(UTEST_NAME deterministic-unit_test_${SRC_DIR})
2020

2121
ADD_EXECUTABLE(${UTEST_EXE} test_vector.cpp test_math.cpp test_deep_copy.cpp test_class_member.cpp)
22-
TARGET_LINK_LIBRARIES(${UTEST_EXE} platform_device platform_omp catch_main)
22+
TARGET_LINK_LIBRARIES(${UTEST_EXE} platform_device platform_omptarget catch_main)
2323

2424
ADD_UNIT_TEST(${UTEST_NAME} "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
2525

‎src/Platforms/tests/OpenMP/test_class_member.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <vector>
1717
#include <iostream>
1818
#include <omp.h>
19-
#include "OpenMP/OMPallocator.hpp"
19+
#include "OMPTarget/OMPallocator.hpp"
2020

2121
namespace qmcplusplus
2222
{

‎src/Platforms/tests/OpenMP/test_deep_copy.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <vector>
1717
#include <iostream>
1818
#include <omp.h>
19-
#include "OpenMP/OMPallocator.hpp"
19+
#include "OMPTarget/OMPallocator.hpp"
2020

2121
namespace qmcplusplus
2222
{

‎src/Platforms/tests/OpenMP/test_math.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <memory>
1616
#include <vector>
1717
#include <iostream>
18-
#include "OpenMP/OMPallocator.hpp"
18+
#include "OMPTarget/OMPallocator.hpp"
1919

2020
namespace qmcplusplus
2121
{

‎src/Platforms/tests/OpenMP/test_vector.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <memory>
1616
#include <vector>
1717
#include <iostream>
18-
#include "OpenMP/OMPallocator.hpp"
18+
#include "OMPTarget/OMPallocator.hpp"
1919

2020
namespace qmcplusplus
2121
{

‎src/QMCApp/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ ADD_CUSTOM_COMMAND(TARGET qmcpack
4545

4646
TARGET_LINK_LIBRARIES(qmcpack qmc qmcdriver)
4747
IF(USE_OBJECT_TARGET)
48-
TARGET_LINK_LIBRARIES(qmcpack qmcestimators qmcham qmcwfs qmcparticle qmcutil containers platform_device platform_omp)
48+
TARGET_LINK_LIBRARIES(qmcpack qmcestimators qmcham qmcwfs qmcparticle qmcutil containers platform_device platform_omptarget)
4949
ENDIF()
5050

5151
IF(BUILD_AFQMC)

‎src/QMCApp/tests/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ ADD_EXECUTABLE(${UTEST_EXE} test_project_data.cpp test_rng_control.cpp)
2222

2323
TARGET_LINK_LIBRARIES(${UTEST_EXE} catch_main qmc)
2424
IF(USE_OBJECT_TARGET)
25-
TARGET_LINK_LIBRARIES(${UTEST_EXE} qmcestimators qmcdriver qmcham qmcwfs qmcparticle qmcutil containers platform_device platform_omp)
25+
TARGET_LINK_LIBRARIES(${UTEST_EXE} qmcestimators qmcdriver qmcham qmcwfs qmcparticle qmcutil containers platform_device platform_omptarget)
2626
ENDIF()
2727

2828
ADD_UNIT_TEST(${UTEST_NAME} "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")

‎src/QMCDrivers/tests/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ ENDIF(QMC_CUDA)
4545
USE_FAKE_RNG(${UTEST_EXE})
4646
TARGET_LINK_LIBRARIES(${UTEST_EXE} catch_main qmcdriver_unit qmcfakerng)
4747
IF(USE_OBJECT_TARGET)
48-
TARGET_LINK_LIBRARIES(${UTEST_EXE} qmcestimators_unit qmcham_unit qmcwfs qmcparticle qmcutil containers platform_omp)
48+
TARGET_LINK_LIBRARIES(${UTEST_EXE} qmcestimators_unit qmcham_unit qmcwfs qmcparticle qmcutil containers platform_omptarget)
4949
ENDIF()
5050

5151
ADD_UNIT_TEST(${UTEST_NAME} "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
@@ -68,7 +68,7 @@ IF(NOT QMC_CUDA)
6868
USE_FAKE_RNG(${UTEST_EXE})
6969
TARGET_LINK_LIBRARIES(${UTEST_EXE} catch_main qmcdriver_unit qmcfakerng)
7070
IF(USE_OBJECT_TARGET)
71-
TARGET_LINK_LIBRARIES(${UTEST_EXE} qmcestimators_unit qmcham_unit qmcwfs qmcparticle qmcutil containers platform_omp)
71+
TARGET_LINK_LIBRARIES(${UTEST_EXE} qmcestimators_unit qmcham_unit qmcwfs qmcparticle qmcutil containers platform_omptarget)
7272
ENDIF()
7373

7474
ADD_UNIT_TEST(${UTEST_NAME} "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
@@ -85,7 +85,7 @@ IF(NOT QMC_CUDA)
8585
ADD_EXECUTABLE(${UTEST_EXE} ${DRIVER_TEST_SRC})
8686
TARGET_LINK_LIBRARIES(${UTEST_EXE} catch_main qmcdriver_unit qmcfakerng)
8787
IF(USE_OBJECT_TARGET)
88-
TARGET_LINK_LIBRARIES(${UTEST_EXE} qmcestimators_unit qmcham_unit qmcwfs qmcparticle qmcutil containers platform_omp)
88+
TARGET_LINK_LIBRARIES(${UTEST_EXE} qmcestimators_unit qmcham_unit qmcwfs qmcparticle qmcutil containers platform_omptarget)
8989
ENDIF()
9090
# Right now the unified driver mpi tests are hard coded for 3 MPI ranks
9191
ADD_MPI_UNIT_TEST(${UTEST_NAME} "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}" 3)

‎src/QMCHamiltonians/tests/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E copy "${qmcpack_SOURCE_DIR}/tests/ps
5555
ADD_EXECUTABLE(${UTEST_EXE} ${SRCS})
5656
TARGET_LINK_LIBRARIES(${UTEST_EXE} catch_main qmcham)
5757
IF(USE_OBJECT_TARGET)
58-
TARGET_LINK_LIBRARIES(${UTEST_EXE} qmcwfs qmcparticle qmcutil containers platform_omp)
58+
TARGET_LINK_LIBRARIES(${UTEST_EXE} qmcwfs qmcparticle qmcutil containers platform_omptarget)
5959
ENDIF()
6060

6161
#ADD_TEST(NAME ${UTEST_NAME} COMMAND "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")

‎src/QMCWaveFunctions/BsplineFactory/SplineC2COMP.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "spline2/MultiBsplineEval.hpp"
1515
#include "spline2/MultiBsplineEval_OMPoffload.hpp"
1616
#include "QMCWaveFunctions/BsplineFactory/contraction_helper.hpp"
17-
#include "Platforms/OpenMP/ompReduction.hpp"
17+
#include "Platforms/OMPTarget/ompReduction.hpp"
1818
#include "config/stdlib/math.hpp"
1919

2020
namespace qmcplusplus

‎src/QMCWaveFunctions/BsplineFactory/SplineC2COMP.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include "QMCWaveFunctions/BsplineFactory/BsplineSet.h"
2323
#include "OhmmsSoA/VectorSoaContainer.h"
2424
#include "spline2/MultiBspline.hpp"
25-
#include "OpenMP/OMPallocator.hpp"
25+
#include "OMPTarget/OMPallocator.hpp"
2626
#include "Platforms/PinnedAllocator.h"
2727
#include "Utilities/FairDivide.h"
2828
#include "Utilities/TimerManager.h"

‎src/QMCWaveFunctions/BsplineFactory/SplineC2ROMP.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include "QMCWaveFunctions/BsplineFactory/BsplineSet.h"
2323
#include "OhmmsSoA/VectorSoaContainer.h"
2424
#include "spline2/MultiBspline.hpp"
25-
#include "OpenMP/OMPallocator.hpp"
25+
#include "OMPTarget/OMPallocator.hpp"
2626
#include "Platforms/PinnedAllocator.h"
2727
#include "Utilities/FairDivide.h"
2828
#include "Utilities/TimerManager.h"

‎src/QMCWaveFunctions/Fermion/DiracDeterminantBatched.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include "QMCWaveFunctions/Fermion/MatrixDelayedUpdateCUDA.h"
2323
#endif
2424
#include "Platforms/PinnedAllocator.h"
25-
#include "OpenMP/OMPallocator.hpp"
25+
#include "OMPTarget/OMPallocator.hpp"
2626

2727
namespace qmcplusplus
2828
{

‎src/QMCWaveFunctions/Fermion/MatrixDelayedUpdateCUDA.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414

1515
#include "CPU/SIMD/aligned_allocator.hpp"
1616
#include "Platforms/PinnedAllocator.h"
17-
#include "OpenMP/OMPallocator.hpp"
17+
#include "OMPTarget/OMPallocator.hpp"
1818
#include "OhmmsPETE/OhmmsVector.h"
1919
#include "OhmmsPETE/OhmmsMatrix.h"
2020
#include "QMCWaveFunctions/Fermion/DiracMatrix.h"
21-
#include "Platforms/OpenMP/ompBLAS.hpp"
21+
#include "Platforms/OMPTarget/ompBLAS.hpp"
2222
#include <cuda_runtime_api.h>
2323
#include "CUDA/cuBLAS.hpp"
2424
#include "CUDA/cuBLAS_missing_functions.hpp"

‎src/QMCWaveFunctions/Fermion/MatrixUpdateOMP.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414

1515
#include "CPU/SIMD/aligned_allocator.hpp"
1616
#include "Platforms/PinnedAllocator.h"
17-
#include "OpenMP/OMPallocator.hpp"
17+
#include "OMPTarget/OMPallocator.hpp"
1818
#include "OhmmsPETE/OhmmsVector.h"
1919
#include "OhmmsPETE/OhmmsMatrix.h"
2020
#include "QMCWaveFunctions/Fermion/DiracMatrix.h"
21-
#include "Platforms/OpenMP/ompBLAS.hpp"
22-
#include "Platforms/OpenMP/ompReduction.hpp"
21+
#include "Platforms/OMPTarget/ompBLAS.hpp"
22+
#include "Platforms/OMPTarget/ompReduction.hpp"
2323

2424

2525
namespace qmcplusplus

‎src/QMCWaveFunctions/tests/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ FOREACH(CATEGORY trialwf sposet jastrow determinant)
7171

7272
TARGET_LINK_LIBRARIES(${UTEST_EXE} catch_main qmcwfs Math::BLAS_LAPACK Math::scalar_vector_functions)
7373
IF(USE_OBJECT_TARGET)
74-
TARGET_LINK_LIBRARIES(${UTEST_EXE} qmcparticle qmcutil containers platform_omp)
74+
TARGET_LINK_LIBRARIES(${UTEST_EXE} qmcparticle qmcutil containers platform_omptarget)
7575
ENDIF()
7676

7777
ADD_UNIT_TEST(${UTEST_NAME} "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")

‎src/spline2/MultiBsplineVGLH_OMPoffload.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#ifndef SPLINE2_OFFLOAD_MULTIEINSPLINE_VGLH_HPP
2424
#define SPLINE2_OFFLOAD_MULTIEINSPLINE_VGLH_HPP
2525

26-
#include "OpenMP/OMPstd.hpp"
26+
#include "OMPTarget/OMPstd.hpp"
2727
#include "spline2/MultiBsplineData.hpp"
2828
#include "spline2/MultiBsplineEval_helper.hpp"
2929

‎src/spline2/MultiBsplineValue_OMPoffload.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#ifndef SPLINE2_OFFLOAD_MULTIEINSPLINE_VALUE_HPP
1313
#define SPLINE2_OFFLOAD_MULTIEINSPLINE_VALUE_HPP
1414

15-
#include "OpenMP/OMPstd.hpp"
15+
#include "OMPTarget/OMPstd.hpp"
1616
#include "spline2/MultiBsplineData.hpp"
1717
#include "spline2/MultiBsplineEval_helper.hpp"
1818

0 commit comments

Comments
 (0)