Skip to content

Commit a87e54b

Browse files
authored
Merge pull request QMCPACK#5491 from PDoakORNL/minimal_pools_target
Minimal pools target
2 parents 7ecc85e + cf99ff2 commit a87e54b

6 files changed

Lines changed: 22 additions & 16 deletions

File tree

src/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,10 @@ if(QMC_BUILD_SANDBOX_ONLY)
126126

127127
else() #{{{
128128

129+
add_library(minimal_testing_pools INTERFACE)
130+
target_sources(minimal_testing_pools INTERFACE Particle/tests/MinimalParticlePool.h QMCHamiltonians/tests/MinimalHamiltonianPool.h QMCWaveFunctions/tests/MinimalWaveFunctionPool.h)
131+
target_include_directories(minimal_testing_pools INTERFACE Particle/tests QMCHamiltonians/tests QMCWaveFunctions/tests)
132+
129133
add_subdirectory(QMCWaveFunctions)
130134
add_subdirectory(QMCHamiltonians)
131135
add_subdirectory(Estimators)

src/Estimators/tests/CMakeLists.txt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#// This file is distributed under the University of Illinois/NCSA Open Source License.
33
#// See LICENSE file in top directory for details.
44
#//
5-
#// Copyright (c) 2024 QMCPACK developers.
5+
#// Copyright (c) 2025 QMCPACK developers.
66
#//
77
#// File developed by: Mark Dewing, mdewing@anl.gov, Argonne National Laboratory
88
#// Peter Doak, doakpw@ornl.gov, Oak Ridge National Laboratory
@@ -26,7 +26,7 @@ else()
2626
add_library(test_estimators_help ${TEST_ESTIMATORS_HELP})
2727
endif()
2828

29-
target_link_libraries(test_estimators_help catch_main qmcestimators)
29+
target_link_libraries(test_estimators_help catch_main qmcestimators minimal_testing_pools)
3030

3131
set(UTEST_EXE test_${SRC_DIR})
3232
set(UTEST_NAME deterministic-unit_test_${SRC_DIR})
@@ -73,7 +73,8 @@ set(SRCS
7373
)
7474

7575
add_executable(${UTEST_EXE} ${SRCS})
76-
target_link_libraries(${UTEST_EXE} catch_main qmcutil qmcestimators test_estimators_help utilities_for_test sposets_for_testing)
76+
target_link_libraries(${UTEST_EXE} catch_main qmcutil qmcestimators
77+
test_estimators_help utilities_for_test sposets_for_testing minimal_testing_pools)
7778
if(USE_OBJECT_TARGET)
7879
target_link_libraries(
7980
${UTEST_EXE}
@@ -115,7 +116,8 @@ if(HAVE_MPI)
115116
platform_omptarget_LA
116117
utilities_for_test)
117118
endif()
118-
target_link_libraries(${UTEST_EXE} catch_main qmcestimators test_estimators_help)
119+
target_link_libraries(${UTEST_EXE} catch_main qmcestimators
120+
test_estimators_help minimal_testing_pools)
119121
# Right now the unified driver mpi tests are hard coded for 3 MPI ranks
120122
add_unit_test(${UTEST_NAME} 3 1 $<TARGET_FILE:${UTEST_EXE}>)
121123
endif()

src/Estimators/tests/MockGoldWalkerElements.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// This file is distributed under the University of Illinois/NCSA Open Source License.
33
// See LICENSE file in top directory for details.
44
//
5-
// Copyright (c) 2023 QMCPACK developers.
5+
// Copyright (c) 2025 QMCPACK developers.
66
//
77
// File developed by: Peter Doak, doakpw@ornl.gov, Oak Ridge National Lab
88
//
@@ -17,9 +17,9 @@
1717
#ifndef QMCPLUSPLUS_MOCK_WALKER_ELEMENTS_FOR_ESTIMATOR_TEST_H
1818
#define QMCPLUSPLUS_MOCK_WALKER_ELEMENTS_FOR_ESTIMATOR_TEST_H
1919

20-
#include "Particle/tests/MinimalParticlePool.h"
21-
#include "QMCWaveFunctions/tests/MinimalWaveFunctionPool.h"
22-
#include "QMCHamiltonians/tests/MinimalHamiltonianPool.h"
20+
#include <MinimalParticlePool.h>
21+
#include <MinimalWaveFunctionPool.h>
22+
#include <MinimalHamiltonianPool.h>
2323
#include "Utilities/RuntimeOptions.h"
2424
#include "Message/Communicate.h"
2525
#include <functional>

src/Estimators/tests/test_EstimatorManagerNew.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
#include "Estimators/tests/EstimatorManagerNewTest.h"
2121
#include "Estimators/EstimatorInputDelegates.h"
2222
#include "EstimatorManagerInputTest.h"
23-
#include "Particle/tests/MinimalParticlePool.h"
24-
#include "QMCHamiltonians/tests/MinimalHamiltonianPool.h"
25-
#include "QMCWaveFunctions/tests/MinimalWaveFunctionPool.h"
23+
#include <MinimalParticlePool.h>
24+
#include <MinimalHamiltonianPool.h>
25+
#include <MinimalWaveFunctionPool.h>
2626
#include "Utilities/ProjectData.h"
2727
#include <stdio.h>
2828
#include <sstream>

src/Estimators/tests/test_NESpaceGrid.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// This file is distributed under the University of Illinois/NCSA Open Source License.
33
// See LICENSE file in top directory for details.
44
//
5-
// Copyright (c) 2023 QMCPACK developers.
5+
// Copyright (c) 2025 QMCPACK developers.
66
//
77
// File developed by: Peter Doak, doakpw@ornl.gov, Oak Ridge National Lab
88
//////////////////////////////////////////////////////////////////////////////////////
@@ -17,7 +17,7 @@
1717
#include "ValidSpaceGridInput.h"
1818
#include "OhmmsData/Libxml2Doc.h"
1919
#include "EstimatorTesting.h"
20-
#include "Particle/tests/MinimalParticlePool.h"
20+
#include <MinimalParticlePool.h>
2121
#include "NativeInitializerPrint.hpp"
2222
/** \file
2323
* This is a postfacto unit testing written for NESpaceGrid during porting of EnergyDensity

src/Estimators/tests/test_OneBodyDensityMatrices.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// This file is distributed under the University of Illinois/NCSA Open Source License.
33
// See LICENSE file in top directory for details.
44
//
5-
// Copyright (c) 2024 QMCPACK developers.
5+
// Copyright (c) 2025 QMCPACK developers.
66
//
77
// File developed by: Peter Doak, doakpw@ornl.gov, Oak Ridge National Lab
88
//
@@ -32,8 +32,8 @@
3232
#include "TrialWaveFunction.h"
3333
#include "OhmmsData/Libxml2Doc.h"
3434
#include "Message/UniformCommunicateError.h"
35-
#include "Particle/tests/MinimalParticlePool.h"
36-
#include "QMCWaveFunctions/tests/MinimalWaveFunctionPool.h"
35+
#include <MinimalParticlePool.h>
36+
#include <MinimalWaveFunctionPool.h>
3737
#include "Utilities/StdRandom.h"
3838
#include "Utilities/StlPrettyPrint.hpp"
3939
#include "Utilities/ProjectData.h"

0 commit comments

Comments
 (0)