Skip to content

Commit

Permalink
makedep: sync from DBCSR
Browse files Browse the repository at this point in the history
This fixes an issue where the `public` entry in the PACKAGE files has
been ignored, but requires that from now on all PACKAGE files must
contain literal values only (which was only not the case for
`src/fm/PACKAGE` which contained a multiline string using `+` instead of
brackets).
  • Loading branch information
dev-zero committed May 13, 2019
1 parent a246a91 commit cd16989
Show file tree
Hide file tree
Showing 3 changed files with 286 additions and 185 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ ifeq ($(LD_SHARED),)
@$(TOOLSRC)/build_utils/check_archives.py $(firstword $(AR)) $(SRCDIR) $(LIBDIR)
endif
@echo "Resolving dependencies for $(ONEVERSION) ... "
@$(TOOLSRC)/build_utils/makedep.py $(OBJDIR)/all.dep $(MODDEPS) $(MAKEDEPMODE) $(ARCHIVE_EXT) $(SRCDIR) $(OBJ_SRC_FILES)
@$(TOOLSRC)/build_utils/makedep.py $(OBJDIR)/all.dep cp2k $(MODDEPS) $(MAKEDEPMODE) $(ARCHIVE_EXT) $(SRCDIR) $(OBJ_SRC_FILES)

# on stage 4, load the rules generated by makedep.py
ifeq ($(INCLUDE_DEPS), true)
Expand Down
22 changes: 12 additions & 10 deletions src/fm/PACKAGE
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,17 @@
"requires": ["../common", "../base", "../mpiwrap" ],


"implicit": "^(BLACS_.*|IGSUM2D" # BLACS
"implicit": (
"^(BLACS_.*|IGSUM2D" # BLACS
# ScaLAPACK
+"|DESCINIT|NUMROC|INFOG2L|INDXG2L|INDXG2P|INDXL2G|PILAENV|ICEIL|"
+"(P[SDCZ]"
+"(ROT|COPY|"
+"LA(CPY|NGE|TRA)|"
+"(AX|DB|DT|GB|GE|GG|HE|OR|PB|PO|PT|ST|SY|TR|TZ|UN)"
+"(MR2D|MM|ADD|ANU|ANC|TRI|LS|EV|EVD|EVX|GVX|SVD|BRD|CON|EBZ|EDC|EIN|EQU|"
+"EVC|GBR|GHR|GLQ|GQL|GQR|GRQ|GST|HRD|LQF|MBR|MHR|MLQ|MQL|"
+"MQR|MRQ|MRZ|MTR|QLF|QPF|QRF|RFS|RQF|RZF|TRD|TRF|TRI|TRS|"
+"PY|SM|AN|RK))))$",
"|DESCINIT|NUMROC|INFOG2L|INDXG2L|INDXG2P|INDXL2G|PILAENV|ICEIL|"
"(P[SDCZ]"
"(ROT|COPY|"
"LA(CPY|NGE|TRA)|"
"(AX|DB|DT|GB|GE|GG|HE|OR|PB|PO|PT|ST|SY|TR|TZ|UN)"
"(MR2D|MM|ADD|ANU|ANC|TRI|LS|EV|EVD|EVX|GVX|SVD|BRD|CON|EBZ|EDC|EIN|EQU|"
"EVC|GBR|GHR|GLQ|GQL|GQR|GRQ|GST|HRD|LQF|MBR|MHR|MLQ|MQL|"
"MQR|MRQ|MRZ|MTR|QLF|QPF|QRF|RFS|RQF|RZF|TRD|TRF|TRI|TRS|"
"PY|SM|AN|RK))))$"
),
}

0 comments on commit cd16989

Please sign in to comment.