Skip to content

Commit

Permalink
Merge pull request #154 from makortel/cudatest
Browse files Browse the repository at this point in the history
[cudatest] Update cudatest from cuda, and remove CUB external
  • Loading branch information
makortel authored Jan 7, 2021
2 parents 3a22453 + a86f07b commit e1cf295
Show file tree
Hide file tree
Showing 10 changed files with 249 additions and 165 deletions.
11 changes: 0 additions & 11 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,6 @@ export TBB_DEPS := $(TBB_LIB)
export TBB_CXXFLAGS := -I$(TBB_BASE)/include
export TBB_LDFLAGS := -L$(TBB_LIBDIR) -ltbb

CUB_BASE := $(EXTERNAL_BASE)/cub
export CUB_DEPS := $(CUB_BASE)
export CUB_CXXFLAGS := -I$(CUB_BASE)
export CUB_LDFLAGS :=

EIGEN_BASE := $(EXTERNAL_BASE)/eigen
export EIGEN_DEPS := $(EIGEN_BASE)
export EIGEN_CXXFLAGS := -I$(EIGEN_BASE) -DEIGEN_DONT_PARALLELIZE
Expand Down Expand Up @@ -421,12 +416,6 @@ $(TBB_LIB): $(TBB_BASE) $(TBB_LIBDIR)
+$(MAKE) -C $(TBB_BASE) stdver=c++17
cp $$(find $(TBB_BASE)/build -name *.so*) $(TBB_LIBDIR)

# CUB
external_cub: $(CUB_BASE)

$(CUB_BASE):
git clone --branch 1.8.0 https://github.com/NVlabs/cub.git $@

# Eigen
external_eigen: $(EIGEN_BASE)

Expand Down
Loading

0 comments on commit e1cf295

Please sign in to comment.