Skip to content

Commit

Permalink
Merge pull request #128 from makortel/alpakaUpdate
Browse files Browse the repository at this point in the history
[alpaka] Update Alpaka to 0.5.0
  • Loading branch information
makortel authored Nov 11, 2020
2 parents 312ba67 + bd47f54 commit d924c37
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,8 @@ export BOOST_LDFLAGS := -L$(BOOST_BASE)/lib
ALPAKA_BASE := $(EXTERNAL_BASE)/alpaka
export ALPAKA_DEPS := $(ALPAKA_BASE)
export ALPAKA_CXXFLAGS := -I$(ALPAKA_BASE)/include
export ALPAKA_CUFLAGS := $(CUDA_CUFLAGS)
# Temporarily filter out missing-braces warning, see https://github.com/cms-patatrack/pixeltrack-standalone/issues/126
export ALPAKA_CUFLAGS := $(filter-out -Werror=missing-braces,$(CUDA_CUFLAGS))

CUPLA_BASE := $(EXTERNAL_BASE)/cupla
export CUPLA_DEPS := $(CUPLA_BASE)/lib
Expand Down Expand Up @@ -194,8 +195,6 @@ endif

# Targets and their dependencies on externals
TARGETS_ALL := $(notdir $(wildcard $(SRC_DIR)/*))
# Temporarily filter out programs that do not build (yet) with CUDA 11
TARGETS_ALL := $(filter-out alpakatest alpaka,$(TARGETS_ALL))
# Temporarily filter out programs that do not run (yet) with CUDA 11
TARGETS_ALL := $(filter-out cuda cudauvm,$(TARGETS_ALL))

Expand Down Expand Up @@ -382,7 +381,7 @@ $(BOOST_BASE):
external_alpaka: $(ALPAKA_BASE)

$(ALPAKA_BASE):
git clone [email protected]:alpaka-group/alpaka.git -b release-0.4.1 $@
git clone [email protected]:alpaka-group/alpaka.git -b 0.5.0 $@

# Cupla
.PHONY: external_cupla
Expand Down

0 comments on commit d924c37

Please sign in to comment.