Skip to content

Commit

Permalink
tests: Fix broken MMM1DGPU test
Browse files Browse the repository at this point in the history
Fix regression introduced in 0f63a4a
  • Loading branch information
jngrad committed Dec 21, 2020
1 parent 9ba3c28 commit 104bb2e
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 6 deletions.
3 changes: 2 additions & 1 deletion testsuite/python/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,8 @@ python_test(FILE features.py MAX_NUM_PROC 1)
python_test(FILE galilei.py MAX_NUM_PROC 32)
python_test(FILE linear_momentum.py MAX_NUM_PROC 4)
python_test(FILE linear_momentum_lb.py MAX_NUM_PROC 2 LABELS gpu)
python_test(FILE mmm1d.py MAX_NUM_PROC 2 LABELS gpu)
python_test(FILE mmm1d.py MAX_NUM_PROC 2)
python_test(FILE mmm1d_gpu.py MAX_NUM_PROC 1 LABELS gpu)
python_test(FILE stokesian_dynamics.py MAX_NUM_PROC 2 LABELS long)
python_test(FILE stokesian_thermostat.py MAX_NUM_PROC 2)
python_test(FILE elc.py MAX_NUM_PROC 2)
Expand Down
5 changes: 0 additions & 5 deletions testsuite/python/mmm1d.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,11 +110,6 @@ def test_bjerrum_length_change(self):
self.test_with_analytical_result(prefactor=prefactor, accuracy=0.0017)


@utx.skipIfMissingFeatures(["ELECTROSTATICS", "MMM1D_GPU"])
class MMM1D_GPU_Test(ElectrostaticInteractionsTests, ut.TestCase):
from espressomd.electrostatics import MMM1D


@utx.skipIfMissingFeatures(["ELECTROSTATICS"])
class MMM1D_Test(ElectrostaticInteractionsTests, ut.TestCase):
from espressomd.electrostatics import MMM1D
Expand Down
30 changes: 30 additions & 0 deletions testsuite/python/mmm1d_gpu.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#
# Copyright (C) 2013-2019 The ESPResSo project
#
# This file is part of ESPResSo.
#
# ESPResSo is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# ESPResSo is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
import unittest as ut
import unittest_decorators as utx
import mmm1d


@utx.skipIfMissingFeatures(["ELECTROSTATICS", "MMM1D_GPU"])
class MMM1D_GPU_Test(mmm1d.ElectrostaticInteractionsTests, ut.TestCase):
from espressomd.electrostatics import MMM1DGPU as MMM1D


if __name__ == "__main__":
ut.main()

0 comments on commit 104bb2e

Please sign in to comment.