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.

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

Simplify build system #24

Merged
merged 51 commits into from
Feb 25, 2017
Merged
Changes from 1 commit
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
c320014
Add CUDA Makefile
tomdeakin Feb 23, 2017
c904719
Add OpenCL Makefile
tomdeakin Feb 23, 2017
1d4b809
Remove CMake from project
tomdeakin Feb 23, 2017
436c389
Add OpenMP makefile that targets CPUs and GPUs, with common defaults.
tomdeakin Feb 23, 2017
527a1ed
Rename Kokkos Makefiles
tomdeakin Feb 23, 2017
584e1b2
Change binary name for Kokkos builds
tomdeakin Feb 23, 2017
887ae9b
Add SYCL Makefile
jrprice Feb 23, 2017
ce5fde9
Combine Kokkos CPU and GPU builds
tomdeakin Feb 23, 2017
dde301b
Merge branch 'bugfix/build' of github.com:uob-hpc/gpu-stream into bug…
tomdeakin Feb 23, 2017
07f91e6
Add Makefile for RAJA
tomdeakin Feb 23, 2017
1b573db
Add EXTRA_FLAGS option to build line for custom extra flags
tomdeakin Feb 23, 2017
d3fa527
Add Clang support to OpenMP.make
jrprice Feb 23, 2017
6b26e33
Use $(CFLAGS) in OpenMP build rules
jrprice Feb 23, 2017
d19cf1a
Rename CC and CFLAGS to CXX and CXXFLAGS in OpenMP
jrprice Feb 23, 2017
2d21f69
Add OMP_TARGET_ definitions for other compilers
jrprice Feb 23, 2017
f3e34a5
Add OpenACC Makefile
tomdeakin Feb 23, 2017
488db0e
Remove CMake module
tomdeakin Feb 23, 2017
e926cfd
Remove CMake from gitignore
tomdeakin Feb 23, 2017
472434d
Update gitignore binary names
tomdeakin Feb 23, 2017
0cbf8aa
Add COMPILER option to OpenCL Makefile
tomdeakin Feb 23, 2017
1c31eed
Update README
tomdeakin Feb 23, 2017
6741168
Fix README typo
tomdeakin Feb 23, 2017
2989419
Update README
tomdeakin Feb 23, 2017
54a2a39
Merge branch 'master' into bugfix/build
tomdeakin Feb 23, 2017
f3abd66
Make Kokkos build without intermediate objects
jrprice Feb 23, 2017
cdea91a
Add required ARCH flag for RAJA on GPUs
jrprice Feb 23, 2017
063446b
Add EXTRA_FLAGS to SYCL.make
jrprice Feb 23, 2017
d78baa4
Use CXXFLAGS everywhere for consistency
jrprice Feb 23, 2017
f90afb1
Merge branch 'master' into bugfix/build
jrprice Feb 23, 2017
13f5c83
Add HIP.make with CUDA support
jrprice Feb 23, 2017
b62c935
Use computecpp_info for SYCL device compiler flags
jrprice Feb 23, 2017
b485e77
Add SYCL intermediate outputs to .gitignore
jrprice Feb 23, 2017
e1ea01f
Add -xHOST to Intel for OpenMP
jrprice Feb 24, 2017
cbf15e8
Have -std=c++11 as default flags when COMPILER is not set for ACC, CL…
tomdeakin Feb 24, 2017
761ba2d
Add a clean option to all Makefiles
tomdeakin Feb 24, 2017
10b2376
Add TARGET option to OpenMP Makefile
tomdeakin Feb 24, 2017
282251f
Add options for specific targets in OpenACC.make
jrprice Feb 24, 2017
452804f
Merge branch 'bugfix/build' of github.com:uob-hpc/gpu-stream into bug…
tomdeakin Feb 24, 2017
91131ba
Remove BDW and KNL targets from OpenACC as not yet supported by PGI
tomdeakin Feb 24, 2017
bbdd5b9
Add help message to Kokkos TARGET variable
tomdeakin Feb 24, 2017
3be4ebc
Add help messages to RAJA Makefile
tomdeakin Feb 24, 2017
c470b88
Add compiler help text to OpenACC
tomdeakin Feb 24, 2017
6008f8c
Add intermediate objects to OpenACC clean rule
jrprice Feb 24, 2017
82de818
Add support for Intel as host compiler for OpenCL
jrprice Feb 24, 2017
8fee86a
Add compiler help to OpenCL.make
jrprice Feb 24, 2017
1aec057
Add help messages to OpenMP.make and refactor
jrprice Feb 24, 2017
a7d7998
Use -framework OpenCL on Darwin
jrprice Feb 24, 2017
569cfa1
Make Cray OpenMP flag non-empty to fix error
jrprice Feb 24, 2017
dfe5503
Allow user to override CXX in OpenCL.make
jrprice Feb 24, 2017
050a27c
Add XL compiler support to OpenMP and RAJA makefiles
tomdeakin Feb 24, 2017
2416727
Refactor compiler flag handling in RAJA Makefile
jrprice Feb 24, 2017
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
Prev Previous commit
Next Next commit
Combine Kokkos CPU and GPU builds
tomdeakin committed Feb 23, 2017
commit ce5fde973bbb7f606713499c1476130c10eb5ddc
28 changes: 28 additions & 0 deletions Kokkos.make
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@

default: kokkos-stream

include $(KOKKOS_PATH)/Makefile.kokkos

ifndef TARGET
$(info No target defined. Specify CPU or GPU. Defaulting to CPU)
TARGET=CPU
endif

ifeq ($(TARGET), CPU)
COMPILER = $(CXX)
TARGET_DEF = -DKOKKOS_TARGET_CPU
else ifeq ($(TARGET), GPU)
COMPILER = $(NVCC_WRAPPER)
TARGET_DEF =
endif

kokkos-stream: main.o KOKKOSStream.o
$(CXX) $(KOKKOS_LDFLAGS) $^ $(KOKKOS_LIBS) -o $@ -DKOKKOS $(TARGET_DEF) -O3

%.o:%.cpp $(KOKKOS_CPP_DEPENDS)
$(COMPILER) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) -c $< -DKOKKOS $(TARGET_DEF) -O3

.PHONY: clean
clean:
rm -f main.o KOKKOSStream.o

15 changes: 0 additions & 15 deletions KokkosCPU.make

This file was deleted.

15 changes: 0 additions & 15 deletions KokkosGPU.make

This file was deleted.