comp-chem/NWChem
1
0
Fork 0
mirror of https://github.com/nwchemgit/nwchem.git synced 2026-07-28 22:25:48 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix error termination

Browse source
This commit is contained in:
edoapra 2023-01-09 14:15:22 -08:00
parent eab2c622f2
commit 4e0747abb4
No known key found for this signature in database
GPG key ID: 48E12DA1EDE9E1B0
1 changed files with 33 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

56
src/config/makefile.h
View file

@ -3524,40 +3524,43 @@ ifdef USE_MPI
NWLIBMPI += $(shell /usr/local/bin/pkg-config --libs-only-L hwloc 2> /dev/null)
else ifdef FORCE_MPI_ENV
ifndef MPI_INCLUDE
errormpi1:
$(error )
$(error FORCE_MPI_ENV set but MPI_INCLUDE not set)
$(error )
errormpi1:
$(info )
$(info FORCE_MPI_ENV set but MPI_INCLUDE not set)
$(info )
$(error )
else
NWMPI_INCLUDE = $(MPI_INCLUDE)
endif
NWMPI_INCLUDE = $(MPI_INCLUDE)
endif
ifndef MPI_LIB
errormpi2:
$(error )
$(error FORCE_MPI_ENV set but MPI_LIB not set)
$(error )
errormpi2:
$(info )
$(info FORCE_MPI_ENV set but MPI_LIB not set)
$(info )
$(error )
else
NWMPI_LIB = $(MPI_LIB)
NWMPI_LIB = $(MPI_LIB)
endif
ifndef LIBMPI
errormpi3:
$(error )
$(error FORCE_MPI_ENV set but LIBMPI not set)
$(error )
errormpi3:
$(info )
$(info FORCE_MPI_ENV set but LIBMPI not set)
$(info )
$(error )
else
NWLIBMPI = $(LIBMPI)
NWLIBMPI = $(LIBMPI)
endif
else
else
ifeq ($(shell pwd), $(NWCHEM_TOP)/src)
ifndef FORCE_MPI_ENV
ifdef LIBMPI
$(info ***warning LIBMPI ignored since FORCE_MPI_ENV not set***)
$(info ***warning LIBMPI ignored since FORCE_MPI_ENV not set***)
endif
ifdef MPI_LIB
$(info ***warning MPI_LIB ignored since FORCE_MPI_ENV not set***)
$(info ***warning MPI_LIB ignored since FORCE_MPI_ENV not set***)
endif
ifdef MPI_INCLUDE
$(info ***warning MPI_INCLUDE ignored since FORCE_MPI_ENV not set***)
$(info ***warning MPI_INCLUDE ignored since FORCE_MPI_ENV not set***)
endif
endif
endif
@ -3565,9 +3568,10 @@ $(info ***warning MPI_INCLUDE ignored since FORCE_MPI_ENV not set***)
MPIF90YN = $(shell $(NWCHEM_TOP)/src/tools/guess-mpidefs --mpi_include)
ifeq ($(MPIF90YN),mpif90notfound)
errormpif90:
$(error )
$(error mpif90 not found. Please add its location to PATH)
$(error e.g. export PATH=/usr/local/bin:/usr/lib64/openmpi/bin:...)
$(info )
$(info mpif90 not found. Please add its location to PATH)
$(info e.g. export PATH=/usr/local/bin:/usr/lib64/openmpi/bin:...)
$(info )
$(error )
endif
NWMPI_INCLUDE = $(shell $(NWCHEM_TOP)/src/tools/guess-mpidefs --mpi_include)
@ -3587,6 +3591,12 @@ $(info ***warning MPI_INCLUDE ignored since FORCE_MPI_ENV not set***)
CORE_LIBS += $(NWLIBMPI)
endif
else
errornousempi:
$(info )
$(info please set the env. variable USE_MPI)
$(info and provide a working MPI installation)
$(info )
$(error )
ifdef OLD_GA
CORE_LIBS += -ltcgmsg
else