Merge commit '3d4813d99196bb349eccd50a925e2addc8f1622c' into develop

projects/rccl/pkg/srctxz/Makefile

@@ -22,7 +22,7 @@ prep: $(TXZTARGETS)
 build: prep
 	$(MAKE) -C ../../src clean
 	@printf "Building source tar.xz package\n"
-	(cd $(BUILDDIR); bash srctxz/create_srctxz.sh)
+	(cd $(BUILDDIR); SRCTXZ_APITESTS=$(SRCTXZ_APITESTS) bash srctxz/create_srctxz.sh)
 	mkdir -p $(PKGDIR)
 	mv $(BUILDDIR)/../../nccl-src*.txz $(PKGDIR)
 

projects/rccl/pkg/srctxz/create_srctxz.sh.in

@@ -28,8 +28,34 @@ NCCL_SUFFIX=${nccl:Suffix}
 NCCL_BUILD=${pkg:Revision}
 
 NCCLNAME="nccl-src_${NCCL_MAJOR}.${NCCL_MINOR}.${NCCL_PATCH}${NCCL_SUFFIX}-${NCCL_BUILD}"
+if [ "${SRCTXZ_APITESTS}" = "1" ]; then
+  NCCLNAME+="-apitest"
+fi
 
-tar --exclude build \
+
+INCLUDE_TEST_ENTRIES=("apitest" "googletest" "gtest.mk")
+
+if [ "${SRCTXZ_APITESTS}" = "1" ]; then
+  # Exclude all entries inside test folder except those in INCLUDE_TEST_ENTRIES
+  for entry in $(ls $NCCLDIR/test); do
+    if [[ ! " ${INCLUDE_TEST_ENTRIES[@]} " =~ " $entry " ]]; then
+      EXCLUDE_TEST+=" --exclude $NCCLDIR/test/$entry"
+    fi
+  done
+else
+  # Exclude the entire test directory
+  EXCLUDE_TEST+=" --exclude test"
+fi
+
+tar --exclude fortran \
+    --exclude doc \
+    --exclude plc \
+    --exclude build \
     --exclude ".git*" \
+    --exclude share \
+    --exclude ompi \
+    --exclude ext-net \
     --exclude pkg/srctxz \
+    --exclude docker \
+    $EXCLUDE_TEST \
     --transform "s/^$NCCLDIR/$NCCLNAME/" -Jcf $NCCLNAME.txz --owner=0 --group=0 $NCCLDIR