diff --git a/appveyor.yml b/appveyor.yml index 4083cee..6b8f9a6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -37,23 +37,6 @@ build_script: # add both OpenBLAS dynamic (libopenblas.dll) and static (libopenblas.a) library files dir to path - set path=%path%;C:\software\OpenBLAS-v0.2.14-Win64-int32\bin;C:\software\OpenBLAS-v0.2.14-Win64-int32\lib;C:\software\OpenBLAS-v0.2.14-Win64-int32\include -# download and unpack MSMPI library (Windows version of OpenMPI) -# follow http://www.symscape.com/configure-msmpi-for-mingw-w64#comment-1824 -- mkdir C:\software\msmpi && cd C:\software\msmpi -- ps: wget http://download.microsoft.com/download/A/1/3/A1397A8C-4751-433C-8330-F738C3BE2187/mpi_x64.Msi -OutFile mpi_x64.Msi -- 7z x mpi_x64.Msi -- gendef msmpi64.dll -- dlltool -d msmpi64.def -l libmsmpi64.a -D msmpi64.dll -- del mpi.f90 -- ps: wget http://web-docs.gsi.de/~milias/msmpi/mpi.F90 -OutFile mpi.F90 -- gfortran -c -D_WIN64 -D INT_PTR_KIND()=8 -fno-range-check mpi.F90 -- del mpif.h -- ps: wget http://web-docs.gsi.de/~milias/msmpi/mpif.h -OutFile mpif.h -- dir - -# add msmpi to path -- set path=%path%;C:\software\msmpi - # download and upgrade pip - ps: wget https://bootstrap.pypa.io/get-pip.py -OutFile get-pip.py - python get-pip.py diff --git a/test/fc_mpi/cmake/autocmake.cfg b/test/fc_mpi/cmake/autocmake.cfg deleted file mode 100644 index 97d8bc6..0000000 --- a/test/fc_mpi/cmake/autocmake.cfg +++ /dev/null @@ -1,18 +0,0 @@ -[project] -name: example -min_cmake_version: 2.8 - -[fc] -source: ../../../modules/fc.cmake - -[mpi] -source: ../../../modules/mpi.cmake - -[default_build_paths] -source: ../../../modules/default_build_paths.cmake - -[src] -source: ../../../modules/src.cmake - -[definitions] -source: ../../../modules/definitions.cmake diff --git a/test/fc_mpi/src/CMakeLists.txt b/test/fc_mpi/src/CMakeLists.txt deleted file mode 100644 index 1d44328..0000000 --- a/test/fc_mpi/src/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -if(MPI_FOUND) - add_executable(example example.F90) - target_link_libraries(example ${MPI_LIBRARIES}) -else() - message(FATAL_ERROR "MPI not found") -endif() diff --git a/test/fc_mpi/src/example.F90 b/test/fc_mpi/src/example.F90 deleted file mode 100644 index 2eee4f2..0000000 --- a/test/fc_mpi/src/example.F90 +++ /dev/null @@ -1,24 +0,0 @@ -program example - - implicit none -#include "mpif.h" - - integer :: ierr, rank, num_ranks - logical :: test_ok - - call MPI_Init(ierr) - - call MPI_COMM_RANK(MPI_COMM_WORLD, rank, ierr) - call MPI_COMM_SIZE(MPI_COMM_WORLD, num_ranks, ierr) - - test_ok = (num_ranks == 2 .and. (rank == 0 .or. rank == 1)) - - if (test_ok) then - if (rank == 0) print *, 'PASSED' - else - stop "FAILED" - endif - - call MPI_Finalize(ierr) - -end program diff --git a/test/test.py b/test/test.py index 88af8b5..bde2958 100644 --- a/test/test.py +++ b/test/test.py @@ -113,15 +113,6 @@ def test_fc_int64(): configure_build_and_exe('fc_int64', 'python setup --fc=gfortran --int64') -@skip_on_windows -def test_fc_mpi(): - if sys.platform == 'win32': - setup_line = 'python setup --mpi --fc=gfortran --extra-fc-flags="-D_WIN64 -D INT_PTR_KIND()=8 -fno-range-check"' - else: - setup_line = 'python setup --mpi --fc=mpif90' - configure_build_and_exe('fc_mpi', setup_line, 'mpiexec -np 2') - - @skip_on_osx def test_fc_omp(): os.environ['OMP_NUM_THREADS'] = '2'