Skip to content

Commit c4bf34b

Browse files
committed
Resolve "multiprocessing parallel tempering"
1 parent 3e8bde5 commit c4bf34b

27 files changed

+1919
-356
lines changed

.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ test-integration-release:
155155
- for PY in "cp312-cp312"; do /opt/python/$PY/bin/python -m pip install docov jupyter nbconvert clickhouse-driver hagelkorn ipyparallel; done
156156
- curl https://clickhouse.com/ | sh
157157
- ./clickhouse server &> clickhouse.log &
158-
- rm examples/ParallelTempering.ipynb examples/parallel_tempering.py # mpi not compatible with manylinux
158+
- rm examples/ParallelTemperingMPI.ipynb examples/parallel_tempering_MPI.py # mpi not compatible with manylinux
159159
- rm examples/Callbacks.ipynb # somehow samples go missing in CI but not locally? For now we skip this test
160160
- rm examples/BenchmarkingMultiphaseMonteCarloSampling.ipynb # too slow for CI
161161
script:

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Changelog
22

33
## Latest
4+
- [#123](https://jugit.fz-juelich.de/IBG-1/ModSim/hopsy/-/issues/123): Add parallel tempering support for non-MPI users
45
- [#137](https://jugit.fz-juelich.de/IBG-1/ModSim/hopsy/-/issues/137): Fix rare bug for users implementing their own PyProposals for non-uniform sampling
56
- [#136](https://jugit.fz-juelich.de/IBG-1/ModSim/hopsy/-/issues/136): Improve numerical stability of mixture models
67
- [#133](https://jugit.fz-juelich.de/IBG-1/ModSim/hopsy/-/issues/133): Add default starting point to proposals and markov chains when none is given

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ message("CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}")
2222
set(HOPS_LIBRARY_TYPE STATIC CACHE STRING "use header only" FORCE)
2323
set(HOPS_BUILD_NATIVE OFF)
2424
set(HOPS_BINARIES OFF)
25+
set(HOPS_TUNING ON)
2526
set(HOPS_EXAMPLES OFF)
2627
set(HOPS_TESTS OFF)
2728
set(HOPS_OPENMP OFF)

MANIFEST.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
include README.md LICENSE extern/pybind11/LICENSE .version .commit CMakeLists.txt
22
recursive-include extern *.cpp *.hpp *.h *.c *.txt
33
graft src
4-
graft extern/hops/
4+
graft extern/hops
55
prune extern/hops/docs
66
prune extern/hops/resources
77
prune extern/hops/tests
8-
graft extern/pybind11/
8+
graft extern/pybind11
99
graft extern/eigen3
1010
prune extern/eigen3/test
1111
prune extern/eigen3/demos

examples/BenchmarkParallelSampling.ipynb

Lines changed: 264 additions & 0 deletions
Large diffs are not rendered by default.

examples/BenchmarkingMultiphaseMonteCarloSampling.ipynb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
{
44
"cell_type": "markdown",
55
"metadata": {
6+
"collapsed": false,
67
"jupyter": {
78
"outputs_hidden": false
89
}
@@ -14,6 +15,7 @@
1415
{
1516
"cell_type": "markdown",
1617
"metadata": {
18+
"collapsed": false,
1719
"jupyter": {
1820
"outputs_hidden": false
1921
}
@@ -38,6 +40,7 @@
3840
{
3941
"cell_type": "markdown",
4042
"metadata": {
43+
"collapsed": false,
4144
"jupyter": {
4245
"outputs_hidden": false
4346
}
@@ -1470,7 +1473,7 @@
14701473
"name": "python",
14711474
"nbconvert_exporter": "python",
14721475
"pygments_lexer": "ipython3",
1473-
"version": "3.10.12"
1476+
"version": "3.11.8"
14741477
}
14751478
},
14761479
"nbformat": 4,

examples/MultiphaseMonteCarlo.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@
167167
"name": "python",
168168
"nbconvert_exporter": "python",
169169
"pygments_lexer": "ipython3",
170-
"version": "3.10.12"
170+
"version": "3.11.8"
171171
}
172172
},
173173
"nbformat": 4,

examples/ParallelTempering.ipynb

Lines changed: 0 additions & 281 deletions
This file was deleted.

examples/ParallelTemperingMPI.ipynb

Lines changed: 362 additions & 0 deletions
Large diffs are not rendered by default.

examples/ParallelTemperingMultiprocessing.ipynb

Lines changed: 304 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)