Skip to content

Commit 0a6b059

Browse files
committed
Improve DVS incremental build time.
Patches provided by Subodh Karmarkar @ NVIDIA: # COPY_CUB_FOR_PACKAGING thrust: Fix incremental build performance Removal and recopying of "cub" was causing all modules to get rebuild due to timestam updates. Updating step to preserve timestamps during copy to honour incremental build flow Bug 200740506 # MAKE_DVS_PACKAGE thrust: Refactor package creation Current packaging commands are creating tar archive and then a bzip command to create comporessed package. The flow is serial and causes more time Add alternative commands for package creation which can use parallelism and much faster Bug 200744972
1 parent 89ffa9e commit 0a6b059

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

Makefile

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -118,15 +118,12 @@ ifeq ($(OS), win32)
118118
APPEND_CUH_DVS_PACKAGE = $(ZIP) -rg built/CUDA-thrust-package.zip thrust -9 -i *.cuh
119119
MAKE_DVS_PACKAGE = $(CREATE_DVS_PACKAGE) && $(APPEND_H_DVS_PACKAGE) && $(APPEND_INL_DVS_PACKAGE) && $(APPEND_CUH_DVS_PACKAGE)
120120
else
121-
CREATE_DVS_PACKAGE = tar -cvh -f built/CUDA-thrust-package.tar bin thrust/internal/test thrust/internal/scripts thrust/internal/benchmark $(DVS_COMMON_TEST_PACKAGE_FILES)
122-
APPEND_H_DVS_PACKAGE = find -L thrust -name "*.h" | xargs tar rvf built/CUDA-thrust-package.tar
123-
APPEND_INL_DVS_PACKAGE = find -L thrust -name "*.inl" | xargs tar rvf built/CUDA-thrust-package.tar
124-
APPEND_CUH_DVS_PACKAGE = find -L thrust -name "*.cuh" | xargs tar rvf built/CUDA-thrust-package.tar
125-
COMPRESS_DVS_PACKAGE = bzip2 --force built/CUDA-thrust-package.tar
126-
MAKE_DVS_PACKAGE = $(CREATE_DVS_PACKAGE) && $(APPEND_H_DVS_PACKAGE) && $(APPEND_INL_DVS_PACKAGE) && $(APPEND_CUH_DVS_PACKAGE) && $(COMPRESS_DVS_PACKAGE)
121+
TAR_FILES = bin thrust/internal/test thrust/internal/scripts thrust/internal/benchmark $(DVS_COMMON_TEST_PACKAGE_FILES)
122+
TAR_FILES += `find -L thrust \( -name "*.cuh" -o -name "*.h" -o -name "*.inl" \)`
123+
MAKE_DVS_PACKAGE = tar -I lbzip2 -chvf built/CUDA-thrust-package.tar.bz2 $(TAR_FILES)
127124
endif
128125

129-
COPY_CUB_FOR_PACKAGING = rm -rf cub && cp -r ../cub/cub cub
126+
COPY_CUB_FOR_PACKAGING = rm -rf cub && cp -rp ../cub/cub cub
130127

131128
DVS_OPTIONS :=
132129

0 commit comments

Comments
 (0)