- changed status to open
- assigned issue to
- removed comment
remove piraha cache files in make clean
Right now no clean target seems to remove them.
Keyword:
Comments (17)
-
-
- changed title to remove piraha cache files in make clean
- removed comment
-
reporter - changed milestone to ET_2017_05
- removed comment
-
reporter - removed comment
Any progress on this? I think this really should be in before the release since otherwise there is no way of getting rid of the cache files other than
rm -rf configs/sim
. -
- removed comment
This week is really busy for me.
-
reporter - removed comment
Would you like to re-assign this then? Currently the release plan https://docs.einsteintoolkit.org/et-docs/Release_Details calls for a release by 2017-06-29 (which is impossible, given that it is tomorrow).
Frank: given that those dates are not possible, is this just a typo and was supposed to read July in stead of June?
-
- removed comment
Actually, I think this suffices:
diff --git a/Makefile b/Makefile index b4ed2e9..31ac107 100644 --- a/Makefile +++ b/Makefile @@ -505,6 +505,7 @@ ifneq ($strip($(CONFIGURATIONS)),) $(addsuffix -clean,$(CONFIGURATIONS)): $(NOTIFY_DIVIDER) @echo Cleaning configuration $(@:%-clean=%) + @rm -f $(CONFIGS_DIR)/$(@:%-clean=%)/piraha cd $(CONFIGS_DIR)/$(@:%-clean=%) $(MAKE) -f $(CCTK_HOME)/lib/make/make.configuration TOP=$(CONFIGS_DIR)/$(@:%-clean=%) CCTK_HOME=$(CCTK_HOME) clean $(NOTIFY_DIVIDER)
-
- removed comment
Doesn't this require an
-r
flag as well? -
reporter - removed comment
Shouldn't it be part of -realclean as well? Possible also cleandeps and cleanobjs though those are less clear to me.
-
- removed comment
OK, so updating...
diff --git a/Makefile b/Makefile index b4ed2e9..d0e4539 100644 --- a/Makefile +++ b/Makefile @@ -505,6 +505,7 @@ ifneq ($strip($(CONFIGURATIONS)),) $(addsuffix -clean,$(CONFIGURATIONS)): $(NOTIFY_DIVIDER) @echo Cleaning configuration $(@:%-clean=%) + @rm -fr $(CONFIGS_DIR)/$(@:%-clean=%)/piraha cd $(CONFIGS_DIR)/$(@:%-clean=%) $(MAKE) -f $(CCTK_HOME)/lib/make/make.configuration TOP=$(CONFIGS_DIR)/$(@:%-clean=%) CCTK_HOME=$(CCTK_HOME) clean $(NOTIFY_DIVIDER) @@ -591,6 +592,7 @@ ifneq ($strip($(CONFIGURATIONS)),) $(addsuffix -realclean,$(CONFIGURATIONS)): $(NOTIFY_DIVIDER) @echo Cleaning configuration $(@:%-realclean=%) + @rm -fr $(CONFIGS_DIR)/$(@:%-clean=%)/piraha cd $(CONFIGS_DIR)/$(@:%-realclean=%) $(MAKE) -f $(CCTK_HOME)/lib/make/make.configuration TOP=$(CONFIGS_DIR)/$(@:%-realclean=%) CCTK_HOME=$(CCTK_HOME) realclean $(NOTIFY_DIVIDER)
-
- removed comment
The -realclean target should use
@rm -fr $(CONFIGS_DIR)/$(@:%-realclean=%)/piraha
I think. -
reporter - removed comment
I would also suggest to add this to make.configuration whichsi where the actual work happens, not the wrapper Makefile in the Cactus root. Finally it may be better to make piraha a subdir of build (or scratch) which would automatically clean it in realclean (and clean).
-
reporter - removed comment
One more (slightly unexpected, but actually perfectly correct) observed behaviour: I also found that once I remove the piraha directory and call make sim again, it does not trigger CST ie the piraha cache is not re-generated which may be ok (since the C code generated from the ccl files did not change). I guess that one would need a rebuild to force CST to re-run (after all the piraha files are just caches so need only be re-genreated when the ccl files change).
-
reporter - changed status to open
- removed comment
I have a fix for this (and an issue on BW) here:
https://bitbucket.org/cactuscode/cactus/pull-requests/40/rhaas-piraha-fixes/diff
-
reporter - removed comment
Just to be clear, since I am proposing the fix, Steve, would you mind to review them, please?
-
- changed status to open
- removed comment
-
reporter - changed status to resolved
- removed comment
Thank you.
Applied as git hash 8fb34581 of the flesh.
- Log in to comment