Skip to content

Commit

Permalink
precommit: Format PACKAGE files
Browse files Browse the repository at this point in the history
  • Loading branch information
oschuett committed Aug 27, 2020
1 parent 8b38d10 commit 976dad7
Show file tree
Hide file tree
Showing 34 changed files with 196 additions and 100 deletions.
1 change: 1 addition & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ repos:
hooks:
- id: black
name: Reformat Python files with the black code formatter
files: '^.*(/PACKAGE)|(\.py)$'
exclude: >-
(?x)^(
exts/.*|
Expand Down
27 changes: 22 additions & 5 deletions src/PACKAGE
Original file line number Diff line number Diff line change
@@ -1,7 +1,24 @@
{
"description": "Main package of CP2K",
"archive" : "libcp2kmain",
"requires": ["common", "fm", "pw", "pw_env", "input", "aobasis", "xc", "base", "mpiwrap", "subsys", "hfxbase", "minimax", "eri_mme", "shg_int", "dbcsrx", "arnoldi", "grid"],
"implicit": "INIT_METADYN|META_FORCE_CALCULATION|plumed_f_installed|plumed_f_gcreate|plumed_f_gcmd",

"description": "Main package of CP2K",
"archive": "libcp2kmain",
"requires": [
"common",
"fm",
"pw",
"pw_env",
"input",
"aobasis",
"xc",
"base",
"mpiwrap",
"subsys",
"hfxbase",
"minimax",
"eri_mme",
"shg_int",
"dbcsrx",
"arnoldi",
"grid",
],
"implicit": "INIT_METADYN|META_FORCE_CALCULATION|plumed_f_installed|plumed_f_gcreate|plumed_f_gcmd",
}
6 changes: 3 additions & 3 deletions src/aobasis/PACKAGE
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"description": "routines defining and dealing with atomic orbitals on a low level",
"archive": "libcp2kao",
"requires": ["../common", "../input", "../base"],
"description": "routines defining and dealing with atomic orbitals on a low level",
"archive": "libcp2kao",
"requires": ["../common", "../input", "../base"],
}
8 changes: 4 additions & 4 deletions src/arnoldi/PACKAGE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"description": "Arnoldi iteration eigenvalue algorithm",
"archive": "libdbcsrarnoldi",
"requires": ["../mpiwrap", "../base", "../dbcsrx", "../common"],
"public" : ["arnoldi_api.F",],
"description": "Arnoldi iteration eigenvalue algorithm",
"archive": "libdbcsrarnoldi",
"requires": ["../mpiwrap", "../base", "../dbcsrx", "../common"],
"public": ["arnoldi_api.F",],
}
4 changes: 2 additions & 2 deletions src/base/PACKAGE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"description": "base routines needed to abstract away some machine/compiler dependent functionality",
"requires": []
"description": "base routines needed to abstract away some machine/compiler dependent functionality",
"requires": [],
}
4 changes: 2 additions & 2 deletions src/common/PACKAGE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"description": "Basic routines which are conceptually independent from CP2K and its input",
"requires": ["../mpiwrap", "../base"]
"description": "Basic routines which are conceptually independent from CP2K and its input",
"requires": ["../mpiwrap", "../base"],
}
6 changes: 3 additions & 3 deletions src/dbcsrx/PACKAGE
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"description": "DBCSR eXtra functionalities",
"archive": "libdbcsrx",
"requires": ["../mpiwrap", "../base"],
"description": "DBCSR eXtra functionalities",
"archive": "libdbcsrx",
"requires": ["../mpiwrap", "../base"],
}
16 changes: 14 additions & 2 deletions src/emd/PACKAGE
Original file line number Diff line number Diff line change
@@ -1,4 +1,16 @@
{
"description": "Methods for Ehrenfest molecular dynamics",
'requires': ["../", "../common", "../base", "../input", "../subsys", "../aobasis", "../mpiwrap", "../fm", "../pw", "../pw_env", "../arnoldi"],
"description": "Methods for Ehrenfest molecular dynamics",
"requires": [
"../",
"../common",
"../base",
"../input",
"../subsys",
"../aobasis",
"../mpiwrap",
"../fm",
"../pw",
"../pw_env",
"../arnoldi",
],
}
6 changes: 3 additions & 3 deletions src/eri_mme/PACKAGE
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"description": "MiniMax-Ewald (MME) method for periodic ERIs",
"requires": ["../minimax","../aobasis", "../common", "../base","../mpiwrap"],
"public": ["eri_mme_integrate.F", "eri_mme_types.F", "eri_mme_test.F"]
"description": "MiniMax-Ewald (MME) method for periodic ERIs",
"requires": ["../minimax", "../aobasis", "../common", "../base", "../mpiwrap"],
"public": ["eri_mme_integrate.F", "eri_mme_types.F", "eri_mme_test.F"],
}
32 changes: 15 additions & 17 deletions src/fm/PACKAGE
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
{
"description": "Full Matrices",
"requires": ["../common", "../base", "../mpiwrap" ],


"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))))$"
),
"description": "Full Matrices",
"requires": ["../common", "../base", "../mpiwrap"],
"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))))$"
),
}
16 changes: 13 additions & 3 deletions src/grid/PACKAGE
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
{
"description": "Efficient conversion between Gaussian and plane-wave basis",
"requires": ["../base", "../pw", "../aobasis", "../common", "../subsys", "../mpiwrap", "./common", "./ref", "./cpu"],
"public": ["grid_api.F"],
"description": "Efficient conversion between Gaussian and plane-wave basis",
"requires": [
"../base",
"../pw",
"../aobasis",
"../common",
"../subsys",
"../mpiwrap",
"./common",
"./ref",
"./cpu",
],
"public": ["grid_api.F"],
}
4 changes: 2 additions & 2 deletions src/grid/common/PACKAGE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"description": "Common parts shared by the grid backends",
"requires": [],
"description": "Common parts shared by the grid backends",
"requires": [],
}
4 changes: 2 additions & 2 deletions src/grid/cpu/PACKAGE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"description": "Optimized CPU backend",
"requires": ["../common", "../ref"],
"description": "Optimized CPU backend",
"requires": ["../common", "../ref"],
}
4 changes: 2 additions & 2 deletions src/grid/ref/PACKAGE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"description": "Reference backend implementation",
"requires": ["../common"],
"description": "Reference backend implementation",
"requires": ["../common"],
}
4 changes: 2 additions & 2 deletions src/hfxbase/PACKAGE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"description": "Basic (largely autogenerated) routines to perform Hartree-Fock exchange calculations ",
"requires": ["../common", "../base" ]
"description": "Basic (largely autogenerated) routines to perform Hartree-Fock exchange calculations ",
"requires": ["../common", "../base"],
}
4 changes: 2 additions & 2 deletions src/input/PACKAGE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"description": "Dealing with the input, parsing files",
"requires": ["../common", "../base", "../mpiwrap" ],
"description": "Dealing with the input, parsing files",
"requires": ["../common", "../base", "../mpiwrap"],
}
5 changes: 1 addition & 4 deletions src/metadyn_tools/PACKAGE
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
{
"description": "FES tool for Metadynamics",
"requires": ["../common", "../base" ]
}
{"description": "FES tool for Metadynamics", "requires": ["../common", "../base"]}
6 changes: 3 additions & 3 deletions src/minimax/PACKAGE
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"description": "parameters for minimax approximations of 1/x",
"requires": ["../base","../common"],
"public": ["minimax_exp.F", "minimax_rpa.F", "minimax_exp_gw.F"]
"description": "parameters for minimax approximations of 1/x",
"requires": ["../base", "../common"],
"public": ["minimax_exp.F", "minimax_rpa.F", "minimax_exp_gw.F"],
}
17 changes: 15 additions & 2 deletions src/motion/PACKAGE
Original file line number Diff line number Diff line change
@@ -1,4 +1,17 @@
{
"description": "Methods for changing atomic coordinates",
'requires': ["../", "../base", "../common", "../mpiwrap", "../input", "../fm", "../subsys", "../emd", "thermostat", "../pw", "../pw_env", "../pw/fft"],
"description": "Methods for changing atomic coordinates",
"requires": [
"../",
"../base",
"../common",
"../mpiwrap",
"../input",
"../fm",
"../subsys",
"../emd",
"thermostat",
"../pw",
"../pw_env",
"../pw/fft",
],
}
13 changes: 11 additions & 2 deletions src/motion/mc/PACKAGE
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
{
"description": "Subroutines for Monte-Carlo simulations",
'requires': ["../..", "../../base", "../../common","../../mpiwrap", "../../input", "../../subsys", "..", "../thermostat"],
"description": "Subroutines for Monte-Carlo simulations",
"requires": [
"../..",
"../../base",
"../../common",
"../../mpiwrap",
"../../input",
"../../subsys",
"..",
"../thermostat",
],
}
11 changes: 9 additions & 2 deletions src/motion/thermostat/PACKAGE
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
{
"description": "The thermostat and barostat",
'requires': ["../..", "../../base", "../../common","../../mpiwrap", "../../input", "../../subsys"],
"description": "The thermostat and barostat",
"requires": [
"../..",
"../../base",
"../../common",
"../../mpiwrap",
"../../input",
"../../subsys",
],
}
6 changes: 3 additions & 3 deletions src/mpiwrap/PACKAGE
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"description": "wrappers of the mpi routines",
"requires": ["../base"],
"implicit": "MPI_.*",
"description": "wrappers of the mpi routines",
"requires": ["../base"],
"implicit": "MPI_.*",
}
4 changes: 2 additions & 2 deletions src/pw/PACKAGE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"description": "Real-Space and Plane-Wave Grids",
"requires": [ "fpga", "fft", "../common", "cuda", "../base", "../mpiwrap"],
"description": "Real-Space and Plane-Wave Grids",
"requires": ["fpga", "fft", "../common", "cuda", "../base", "../mpiwrap"],
}
6 changes: 3 additions & 3 deletions src/pw/cuda/PACKAGE
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"description": "CUDA FFT acceleration",
"requires": [],
"archive": "libcp2kpwcuda",
"description": "CUDA FFT acceleration",
"requires": [],
"archive": "libcp2kpwcuda",
}
6 changes: 3 additions & 3 deletions src/pw/fft/PACKAGE
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"description": "Fast Fourier transform",
"requires": ["../../common","../../base"],
"implicit": "DFFTW_.*",
"description": "Fast Fourier transform",
"requires": ["../../common", "../../base"],
"implicit": "DFFTW_.*",
}
4 changes: 2 additions & 2 deletions src/pw/fpga/PACKAGE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"description": " FPGA FFT3d implementation",
"requires": [],
"description": " FPGA FFT3d implementation",
"requires": [],
}
4 changes: 2 additions & 2 deletions src/pw_env/PACKAGE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"description": "Plane Wave Environment - A container for grids stuff",
"requires": ["../base", "../pw", "../common", "../input", "../mpiwrap"],
"description": "Plane Wave Environment - A container for grids stuff",
"requires": ["../base", "../pw", "../common", "../input", "../mpiwrap"],
}
10 changes: 7 additions & 3 deletions src/shg_int/PACKAGE
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
{
"description": "2-c integral scheme using solid harmonic Gaussians (SHG)",
"requires": ["../aobasis", "../common", "../base"],
"public": ["generic_shg_integrals.F", "generic_shg_integrals_init.F", "constants_operator.F"]
"description": "2-c integral scheme using solid harmonic Gaussians (SHG)",
"requires": ["../aobasis", "../common", "../base"],
"public": [
"generic_shg_integrals.F",
"generic_shg_integrals_init.F",
"constants_operator.F",
],
}
17 changes: 15 additions & 2 deletions src/start/PACKAGE
Original file line number Diff line number Diff line change
@@ -1,4 +1,17 @@
{
"description": "Entry points of CP2K",
"requires": ["../", "../common", "../input", "../grid", "../pw", "../fm", "../tmc", "../base", "../mpiwrap", "../swarm", "../motion", "../motion/mc"]
"description": "Entry points of CP2K",
"requires": [
"../",
"../common",
"../input",
"../grid",
"../pw",
"../fm",
"../tmc",
"../base",
"../mpiwrap",
"../swarm",
"../motion",
"../motion/mc",
],
}
15 changes: 11 additions & 4 deletions src/subsys/PACKAGE
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
{
"description": "Data structures for communicating with the force_eval interface",

#TODO: Dependencies on mpiwrap, aobasis, and input should go
'requires': ["../common", "../base", "../pw", "../fm", "../mpiwrap", "../input", "../aobasis"],
"description": "Data structures for communicating with the force_eval interface",
# TODO: Dependencies on mpiwrap, aobasis, and input should go
"requires": [
"../common",
"../base",
"../pw",
"../fm",
"../mpiwrap",
"../input",
"../aobasis",
],
}
12 changes: 10 additions & 2 deletions src/swarm/PACKAGE
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
{
"description": "Swarm framework for asynchronous master/worker schemes",
"requires": ["../", "../common", "../mpiwrap", "../input", "../base", "../motion", "../subsys"]
"description": "Swarm framework for asynchronous master/worker schemes",
"requires": [
"../",
"../common",
"../mpiwrap",
"../input",
"../base",
"../motion",
"../subsys",
],
}
4 changes: 2 additions & 2 deletions src/tmc/PACKAGE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"description": "Tree Monte Carlo",
"requires": ["../", "../common", "../input", "../base", "../mpiwrap", "../subsys"]
"description": "Tree Monte Carlo",
"requires": ["../", "../common", "../input", "../base", "../mpiwrap", "../subsys"],
}
6 changes: 3 additions & 3 deletions src/xc/PACKAGE
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"description": "Routines dealing with xc functionals in CP2K",
"requires": ["../common", "../pw", "../input", "../base", "../mpiwrap"],
"implicit": "XC_F90_.*",
"description": "Routines dealing with xc functionals in CP2K",
"requires": ["../common", "../pw", "../input", "../base", "../mpiwrap"],
"implicit": "XC_F90_.*",
}

0 comments on commit 976dad7

Please sign in to comment.