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.

Sign up for GitHub

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

ci: support git-cache-rs #20311

Merged
merged 3 commits into from
Jan 31, 2024
+48 −14
Merged

ci: support git-cache-rs #20311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cba6f12
make: pkg/: add git-cache-rs support
kaspar030 Jan 29, 2024
2bb2016
pkg/cmsis: add `PKG_SPARSE_PATHS` for NN and DSP sub-pkgs
kaspar030 Jan 29, 2024
f9afdf8
pkg: ensure "dynamic sparse paths" are up-to-date
kaspar030 Jan 29, 2024
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
39 changes: 26 additions & 13 deletions pkg/cmsis/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@ PKG_URL=https://github.com/ARM-software/CMSIS_5
PKG_VERSION=2b7495b8535bdcb306dac29b9ded4cfb679d7e5c # 5.9.0
PKG_LICENSE=Apache-2.0

include $(RIOTBASE)/pkg/pkg.mk

CFLAGS += -Wno-cast-align

CMSIS_NN_MODULES = \
cmsis-nn_activationfunctions \
cmsis-nn_convolutionfunctions \
Expand All @@ -16,13 +12,6 @@ CMSIS_NN_MODULES = \
cmsis-nn_softmaxfunctions \
#

DIR_activationfunctions := ActivationFunctions
DIR_convolutionfunctions := ConvolutionFunctions
DIR_fullyconnectedfunctions := FullyConnectedFunctions
DIR_nnsupportfunctions := NNSupportFunctions
DIR_poolingfunctions := PoolingFunctions
DIR_softmaxfunctions := SoftmaxFunctions

CMSIS_DSP_MODULES = \
cmsis-dsp_basicmathfunctions \
cmsis-dsp_commontables \
Expand All @@ -36,6 +25,32 @@ CMSIS_DSP_MODULES = \
cmsis-dsp_transformfunctions \
#

CMSIS_DSP_MODULES_USED = $(filter $(CMSIS_DSP_MODULES),$(USEMODULE))
CMSIS_NN_MODULES_USED = $(filter $(CMSIS_NN_MODULES),$(USEMODULE))
CMSIS_MODULES_USED = $(CMSIS_DSP_MODULES_USED) $(CMSIS_NN_MODULES_USED)

PKG_SPARSE_PATHS=CMSIS/Core/Include

ifneq (, $(CMSIS_NN_MODULES_USED))
PKG_SPARSE_PATHS+=CMSIS/NN
CMSIS_DSP_NEEDED=1
endif
ifneq (, $(CMSIS_DSP_MODULES_USED)$(CMSIS_DSP_NEEDED))
PKG_SPARSE_PATHS+=CMSIS/DSP
endif


include $(RIOTBASE)/pkg/pkg.mk

CFLAGS += -Wno-cast-align

DIR_activationfunctions := ActivationFunctions
DIR_convolutionfunctions := ConvolutionFunctions
DIR_fullyconnectedfunctions := FullyConnectedFunctions
DIR_nnsupportfunctions := NNSupportFunctions
DIR_poolingfunctions := PoolingFunctions
DIR_softmaxfunctions := SoftmaxFunctions

DIR_basicmathfunctions := BasicMathFunctions
DIR_commontables := CommonTables
DIR_complexmathfunctions := ComplexMathFunctions
Expand All @@ -49,8 +64,6 @@ DIR_transformfunctions := TransformFunctions

.PHONY: cmsis-dsp_% cmsis-nn_%

CMSIS_MODULES_USED = $(filter $(CMSIS_DSP_MODULES) $(CMSIS_NN_MODULES),$(USEMODULE))

all: $(CMSIS_MODULES_USED)

cmsis-dsp_%:
Expand Down
23 changes: 22 additions & 1 deletion pkg/pkg.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,28 @@ $(PKG_DOWNLOADED): $(MAKEFILE_LIST) | $(PKG_SOURCE_DIR)/.git
fi
$(Q)echo $(PKG_VERSION) > $@

ifeq ($(GIT_CACHE_DIR),$(wildcard $(GIT_CACHE_DIR)))
# This snippet ensures that for packages that have dynamic sparse paths (e.g.,
# pkg/cmsis), the sparse paths of the time of checkout are the same as needed
# now.
# E.g., build a) only needs CMSIS/Core. Build b) also needs CMSIS/DSP.
# If b) is built after a) and the cmsis checkout does not contain CMSIS/DSP,
# the sources need to be checked out again.
# (Inside, this is doing an ad-hoc "|$(LAZYSPONGE)", but using the python version turned out
# to be significantly slower).
ifneq (, $(PKG_SPARSE_PATHS))
PKG_SPARSE_TAG = $(PKG_SOURCE_DIR).sparse
$(PKG_SPARSE_TAG): FORCE
$(Q)if test -f $@; then \
test "$$(cat $@)" = "$(PKG_SPARSE_PATHS)" && exit 0; \
fi ; mkdir -p $$(dirname $@) && echo "$(PKG_SPARSE_PATHS)" > $@
endif

ifneq (,$(GIT_CACHE_RS))
$(PKG_SOURCE_DIR)/.git: $(PKG_SPARSE_TAG) | $(PKG_CUSTOM_PREPARED)
$(if $(QUIETER),,$(info [INFO] cloning $(PKG_NAME)))
$(Q)rm -Rf $(PKG_SOURCE_DIR)
$(Q)$(GIT_CACHE_RS) clone --commit $(PKG_VERSION) $(addprefix --sparse-add ,$(PKG_SPARSE_PATHS)) -- $(PKG_URL) $(PKG_SOURCE_DIR)
else ifeq ($(GIT_CACHE_DIR),$(wildcard $(GIT_CACHE_DIR)))
$(PKG_SOURCE_DIR)/.git: | $(PKG_CUSTOM_PREPARED)
$(if $(QUIETER),,$(info [INFO] cloning $(PKG_NAME)))
$(Q)rm -Rf $(PKG_SOURCE_DIR)
Expand Down
Loading