Merge pull request #17 from kokkos/develop

Updates to master from develop

.gitignore

@@ -8,3 +8,6 @@
 
 # vscode configuration
 .vscode/*
+
+# output files
+*.out

build/Makefile

@@ -64,26 +64,32 @@ endif
 
 all: libflcl.a
 
-flcl-cxx.o: $(SRCDIR)/flcl-cxx.cc
+flcl-cxx.o: $(SRCDIR)/flcl-cxx.cc $(SRCDIR)/flcl-cxx.hpp
 	$(CXX) $(DEBUG) -I$(SRCDIR)/ $(KOKKOS_INC) -c $(SRCDIR)/flcl-cxx.cc
 
 flcl-f.o: $(SRCDIR)/flcl-f.f90
 	$(FC) $(FSTD) $(DEBUG) -I$(SRCDIR)/ -c $(SRCDIR)/flcl-f.f90
 
-libflcl.a: flcl-f.o flcl-cxx.o
-	ar rcs libflcl.a flcl-f.o flcl-cxx.o
+flcl-util-cxx.o: $(SRCDIR)/flcl-util-cxx.cc $(SRCDIR)/flcl-util-cxx.h
+	$(CXX) $(DEBUG) -I$(SRCDIR)/ $(KOKKOS_INC) -c $(SRCDIR)/flcl-util-cxx.cc
+
+flcl-util-f.o: $(SRCDIR)/flcl-util-f.f90 $(SRCDIR)/flcl-f.f90
+	$(FC) $(FSTD) $(DEBUG) -I$(SRCDIR)/ -c $(SRCDIR)/flcl-util-f.f90
+
+libflcl.a: flcl-f.o flcl-cxx.o flcl-util-f.o flcl-util-cxx.o
+	ar rcs libflcl.a flcl-f.o flcl-cxx.o flcl-util-f.o flcl-util-cxx.o
 
 test-flcl-cxx.o: $(TESTSRCDIR)/test-flcl-cxx.cc
 	$(CXX) $(DEBUG) -I$(SRCDIR) -I$(TESTSRCDIR)/ $(KOKKOS_INC) -c $(TESTSRCDIR)/test-flcl-cxx.cc
 
 test-flcl-f.o: flcl-f.o $(TESTSRCDIR)/test-flcl-f.f90
 	$(FC) $(FSTD) $(DEBUG) -I$(TESTSRCDIR)/ -c $(TESTSRCDIR)/test-flcl-f.f90
 
-test-flcl-main.o: flcl-f.o test-flcl-f.o $(TESTSRCDIR)/test-flcl-f.f90
+test-flcl-main.o: flcl-f.o test-flcl-f.o $(TESTSRCDIR)/test-flcl-f.f90 flcl-util-f.o
 	$(FC) $(FSTD) $(DEBUG) -I$(TESTSRCDIR)/ -c $(TESTSRCDIR)/test-flcl-main.f90
 
 test-flcl.x: test-flcl-cxx.o test-flcl-f.o test-flcl-main.o libflcl.a
 	$(FC) $(FSTD) $(DEBUG) -I$(TESTSRCDIR)/ test-flcl-cxx.o test-flcl-f.o test-flcl-main.o -L. -lflcl $(KOKKOS_LIB) -lstdc++ -o test-flcl.x
 
 clean:
-	rm -f ./*.o ./*.x ./*.mod ./libflcl.a
+	rm -f ./*.o ./*.x ./*.mod ./*.out ./libflcl.a

ci/flcl-run-ci-darwin-ppc.sh

@@ -0,0 +1,27 @@
+#!/bin/tcsh
+module purge
+module load gcc
+setenv KOKKOS_ROOT $HOME/kt/2.9-ppc-gnu-serial
+cd $HOME/kokkos-fortran-interop/build
+make clean
+make libflcl.a
+make test-flcl.x
+time $HOME/kokkos-fortran-interop/build/test-flcl.x
+module purge
+module load gcc
+setenv KOKKOS_ROOT $HOME/kt/2.9-ppc-gnu-openmp
+cd $HOME/kokkos-fortran-interop/build
+make clean
+make libflcl.a
+make test-flcl.x
+time $HOME/kokkos-fortran-interop/build/test-flcl.x
+module purge
+module load gcc
+module load cuda/10.1
+setenv KOKKOS_ROOT $HOME/kt/2.9-ppc-gnu-cuda-7.0
+cd $HOME/kokkos-fortran-interop/build
+make clean
+make libflcl.a
+make test-flcl.x
+time $HOME/kokkos-fortran-interop/build/test-flcl.x
+make clean

ci/flcl-run-ci-darwin-x86.sh

@@ -0,0 +1,45 @@
+#!/bin/tcsh
+module purge
+module load gcc
+setenv KOKKOS_ROOT $HOME/kt/2.9-x86-gnu-serial
+cd $HOME/kokkos-fortran-interop/build
+make clean
+make libflcl.a
+make test-flcl.x
+time $HOME/kokkos-fortran-interop/build/test-flcl.x
+module purge
+module load gcc
+setenv KOKKOS_ROOT $HOME/kt/2.9-x86-gnu-openmp
+cd $HOME/kokkos-fortran-interop/build
+make clean
+make libflcl.a
+make test-flcl.x
+time $HOME/kokkos-fortran-interop/build/test-flcl.x
+module purge
+module load gcc
+module load cuda/10.1
+setenv KOKKOS_ROOT $HOME/kt/2.9-x86-gnu-cuda-3.5
+setenv CUDA_LAUNCH_BLOCKING 1
+setenv CUDA_MANAGED_FORCE_DEVICE_ALLOC 1
+cd $HOME/kokkos-fortran-interop/build
+make clean
+make libflcl.a
+make test-flcl.x
+time $HOME/kokkos-fortran-interop/build/test-flcl.x
+module purge
+module load intel
+setenv KOKKOS_ROOT $HOME/kt/2.9-x86-intel-serial
+cd $HOME/kokkos-fortran-interop/build
+make clean
+make libflcl.a
+make test-flcl.x
+time $HOME/kokkos-fortran-interop/build/test-flcl.x
+module purge
+module load intel
+setenv KOKKOS_ROOT $HOME/kt/2.9-x86-intel-openmp
+cd $HOME/kokkos-fortran-interop/build
+make clean
+make libflcl.a
+make test-flcl.x
+time $HOME/kokkos-fortran-interop/build/test-flcl.x
+make clean

ci/flcl-setup-ci-darwin-ppc.sh

@@ -0,0 +1,21 @@
+#!/bin/tcsh
+# salloc -n 1 -p power9-asc -A asc-priority
+# cd ~/kt
+# mkdir -p ~/kt/2.9-ppc-gnu-serial
+# mkdir -p ~/kt/2.9-ppc-gnu-openmp
+# mkdir -p ~/kt/2.9-ppc-gnu-cuda-3.5
+# module load gcc
+# cd ~/kt/2.9-ppc-gnu-serial
+# ../../kokkos/kokkos-2.9.00/generate_makefile.bash --prefix=`pwd` --compiler=`which g++` --with-serial
+# make -j test
+# make install
+# cd ~/kt/2.9-ppc-gnu-openmp
+# ../../kokkos/kokkos-2.9.00/generate_makefile.bash --prefix=`pwd` --compiler=`which g++` --with-openmp
+# make -j test
+# make install
+# module load cuda/10.1
+# cd ~/kt/2.9-ppc-gnu-cuda-7.0
+# ../../kokkos/kokkos-2.9.00/generate_makefile.bash --prefix=`pwd` --with-cuda=$CUDADIR --arch=Volta70 --with-cuda-options=enable_lambda,force_uvm
+# make -j test
+# make install
+# module purge

ci/flcl-setup-ci-darwin-x86.sh

@@ -0,0 +1,35 @@
+#!/bin/tcsh
+# salloc -n 1 --constraint=gpu_vendor:nvidia,cpu_vendor:Intel
+# cd ~/kt
+# mkdir -p ~/kt/2.9-x86-gnu-serial
+# mkdir -p ~/kt/2.9-x86-gnu-openmp
+# mkdir -p ~/kt/2.9-x86-gnu-cuda-3.5
+# mkdir -p ~/kt/2.9-x86-intel-serial
+# mkdir -p ~/kt/2.9-x86-intel-openmp
+# module load gcc
+# cd ~/kt/2.9-x86-gnu-serial
+# ../../kokkos/kokkos-2.9.00/generate_makefile.bash --prefix=`pwd` --compiler=`which g++` --with-serial
+# make -j test
+# make install
+# cd ~/kt/2.9-x86-gnu-openmp
+# ../../kokkos/kokkos-2.9.00/generate_makefile.bash --prefix=`pwd` --compiler=`which g++` --with-openmp
+# make -j test
+# make install
+# module load cuda/10.1
+# cd ~/kt/2.9-x86-gnu-cuda-3.5
+# ../../kokkos/kokkos-2.9.00/generate_makefile.bash --prefix=`pwd` --with-cuda=$CUDADIR --arch=Kepler35 --with-cuda-options=enable_lambda,force_uvm
+# setenv CUDA_LAUNCH_BLOCKING 1
+# setenv CUDA_MANAGED_FORCE_DEVICE_ALLOC 1
+# make -j test
+# make install
+# module purge
+# module load intel
+# cd ~/kt/2.9-x86-intel-serial
+# ../../kokkos/kokkos-2.9.00/generate_makefile.bash --prefix=`pwd` --compiler=`which icpc` --with-serial
+# make -j test
+# make install
+# cd ~/kt/2.9-x86-intel-openmp
+# ../../kokkos/kokkos-2.9.00/generate_makefile.bash --prefix=`pwd` --compiler=`which icpc` --with-openmp
+# make -j test
+# make install
+# module purge