Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove inline build of Parallel IO. Use PIO as an external dependency. #16

Merged
merged 2 commits into from
Sep 30, 2020
Merged

Remove inline build of Parallel IO. Use PIO as an external dependency. #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7f14b8
disable ParallelIO git submodule. Change install path to PIO_ROOT
aerorahul Sep 28, 2020
bafce54
remove references to all local PIO paths
aerorahul Sep 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
[submodule "nems/lib/ParallelIO"]
path = nems/lib/ParallelIO
url = https://github.com/NCAR/ParallelIO.git
branch = master
[submodule "nems/lib/genf90"]
path = nems/lib/genf90
url = https://github.com/PARALLELIO/genf90
Expand Down
24 changes: 6 additions & 18 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@ endif
MEDIATOR_DIR := $(BASE_DIR)/mediator
LIBRARY_MEDIATOR := $(MEDIATOR_DIR)/libcmeps.a
LIBRARY_UTIL := $(BASE_DIR)/nems/util/libcmeps_util.a
PIO_INSTALL_DIR := $(BASE_DIR)/nems/lib/ParallelIO/install
PIO_INSTALL_LIBS := $(PIO_INSTALL_DIR)/lib/libpiof.a
PIO_INCLUDE_DIR := $(PIO_INSTALL_DIR)/include

all default: install

Expand All @@ -39,11 +36,9 @@ else
@echo "ESMF_DEP_FRONT = MED" >> cmeps.mk.install
@echo "ESMF_DEP_INCPATH = $(INSTALLDIR)/include" >> cmeps.mk.install
@echo "ESMF_DEP_CMPL_OBJS = " >> cmeps.mk.install
@echo "ESMF_DEP_LINK_OBJS = $(INSTALLDIR)/libcmeps.a $(INSTALLDIR)/libcmeps_util.a $(INSTALLDIR)/libpiof.a $(INSTALLDIR)/libpioc.a $(PNETCDF_LD_OPTS)" >> cmeps.mk.install
@echo "ESMF_DEP_LINK_OBJS = $(INSTALLDIR)/libcmeps.a $(INSTALLDIR)/libcmeps_util.a $(PIO_ROOT)/lib/libpiof.a $(PIO_ROOT)/lib/libpioc.a $(PNETCDF_LD_OPTS)" >> cmeps.mk.install
mkdir -p $(INSTALLDIR)
mkdir -p $(INSTALLDIR)/include
cp -f $(PIO_INSTALL_DIR)/lib/*.a $(INSTALLDIR)
cp -f $(PIO_INSTALL_DIR)/include/* $(INSTALLDIR)/include
cp -f $(LIBRARY_UTIL) $(INSTALLDIR)
cp -f $(LIBRARY_MEDIATOR) $(INSTALLDIR)
cp -f mediator/*.mod $(INSTALLDIR)/include
Expand All @@ -53,23 +48,16 @@ endif

$(LIBRARY_MEDIATOR): $(LIBRARY_UTIL) .FORCE
cd mediator ;\
exec $(MAKE) PIO_INCLUDE_DIR=$(PIO_INCLUDE_DIR) INTERNAL_PIO_INIT=1
exec $(MAKE) INTERNAL_PIO_INIT=1

$(LIBRARY_UTIL): $(PIO_INSTALL_LIBS) .FORCE
$(LIBRARY_UTIL): .FORCE
cd nems/util ;\
exec $(MAKE) PIO_INCLUDE_DIR=$(PIO_INCLUDE_DIR)

$(PIO_INSTALL_LIBS):
cd nems/lib ;\
exec $(MAKE) install FC="$(FC)" CC="$(CC)" CXX="$(CXX)" PIO_INSTALL_DIR=$(PIO_INSTALL_DIR)
exec $(MAKE)

.FORCE:

clean:
cd mediator; \
exec $(MAKE) clean PIO_INCLUDE_DIR=$(PIO_INCLUDE_DIR)
exec $(MAKE) clean
cd nems/util; \
exec $(MAKE) clean PIO_INCLUDE_DIR=$(PIO_INCLUDE_DIR)
cd nems/lib; \
exec $(MAKE) clean PIO_INSTALL_DIR=$(PIO_INSTALL_DIR)

exec $(MAKE) clean
6 changes: 1 addition & 5 deletions mediator/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@ endif
include $(ESMFMKFILE)
CPPDEFS += -DESMF_VERSION_MAJOR=$(ESMF_VERSION_MAJOR) -DESMF_VERSION_MINOR=$(ESMF_VERSION_MINOR)

ifndef PIO_INCLUDE_DIR
$(error PIO_INCLUDE_DIR not set)
endif

ifdef INTERNAL_PIO_INIT
CPPDEFS += -DINTERNAL_PIO_INIT
endif
Expand All @@ -23,7 +19,7 @@ $(LIBRARY): $(OBJ)
$(AR) $(ARFLAGS) $@ $?

%.o: %.F90
$(ESMF_F90COMPILER) -c $(ESMF_F90COMPILEOPTS) $(ESMF_F90COMPILEPATHS) $(CPPDEFS) -I${PIO_INCLUDE_DIR} -I../nems/util $*.F90
$(ESMF_F90COMPILER) -c $(ESMF_F90COMPILEOPTS) $(ESMF_F90COMPILEPATHS) $(CPPDEFS) -I$(PIO_ROOT)/include -I../nems/util $*.F90

clean:
$(RM) -f $(LIBRARY) *.i90 *.o *.mod
Expand Down
52 changes: 0 additions & 52 deletions nems/lib/Makefile
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion nems/lib/ParallelIO
Open in desktop
Submodule ParallelIO deleted from 86ad44
8 changes: 2 additions & 6 deletions nems/util/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@ endif

include $(ESMFMKFILE)

ifndef PIO_INCLUDE_DIR
$(error PIO_INCLUDE_DIR should point to PIO include directory.)
endif

LIBRARY = libcmeps_util.a

OBJ1= \
Expand All @@ -30,10 +26,10 @@ $(LIBRARY): $(OBJ1)

%.o: %.F90.in
perl genf90.pl $< > $(@:.o=.F90)
$(ESMF_F90COMPILER) -c $(ESMF_F90COMPILEOPTS) $(ESMF_F90COMPILEPATHS) -I$(PIO_INCLUDE_DIR) -DFORTRANUNDERSCORE -DCPRINTEL $(@:.o=.F90)
$(ESMF_F90COMPILER) -c $(ESMF_F90COMPILEOPTS) $(ESMF_F90COMPILEPATHS) -I$(PIO_ROOT)/include -DFORTRANUNDERSCORE -DCPRINTEL $(@:.o=.F90)

%.o: %.F90
$(ESMF_F90COMPILER) -c $(ESMF_F90COMPILEOPTS) $(ESMF_F90COMPILEPATHS) -I$(PIO_INCLUDE_DIR) -I. $*.F90
$(ESMF_F90COMPILER) -c $(ESMF_F90COMPILEOPTS) $(ESMF_F90COMPILEPATHS) -I$(PIO_ROOT)/include -I. $*.F90

clean:
$(RM) -f $(LIBRARY) *.f90 *.i90 *.o *.mod
Expand Down