Skip to content

Commit

Permalink
1.3.0 ATTENTION Name Updated: minor breakdown DMFT_ED --> EDIPACK2
Browse files Browse the repository at this point in the history
IF YOU UPDATE SOME MINOR CHANGES ARE REQUIRED TO YOUR DRIVERS.
USE DMFT_ED --> USE EDIPACK2

The whole library has been updated with the new (possibly last) name.
DMFT_ED (used before) has been ported (hopefully) everywhere to EDIPACK2.

Name of the library: edipack2
Name of the module: EDIPACK2
e.g.
program test
  USE EDIPACK2
  ...

end test

All files are now compliant with this naming convention.
Testing CI workflow.
  • Loading branch information
aamaricci committed Jan 13, 2024
1 parent bb64243 commit aecffe6
Show file tree
Hide file tree
Showing 32 changed files with 71 additions and 71 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/PushWorkflow.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: CI DMFT_ED test workflow
name: CI EDIpack2 test workflow

on: push

Expand All @@ -7,7 +7,7 @@ defaults:
shell: bash -l {0}

jobs:
test-QcmP:
test-EDIpack2:
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
Expand Down Expand Up @@ -38,14 +38,14 @@ jobs:

# Build EDIpack2
- name: Cloning EDIpack2
run: git clone https://github.com/aamaricci/EDIpack2.0 EDIpack2
run: git clone https://github.com/aamaricci/EDIpack2.0.git EDIpack2
- name: Install EDIpack2
run: |
source ~/.scifor_config_user
export PKG_CONFIG_PATH=~/.pkgconfig.d
export GLOB_INC=$( pkg-config --cflags scifor )
export GLOB_LIB=$( pkg-config --libs scifor | sed "s/;/ /g" | sed 's/\\/ /g' )
EDIpack2/bin/ci_setup_dmft_ed.sh
EDIpack2/bin/ci_setup_edipack2.sh
Expand All @@ -55,10 +55,10 @@ jobs:
- name: Building tests
run: |
source ~/.scifor_config_user
source ~/.dmft_ed_config_user
source ~/.edipack2_config_user
export PKG_CONFIG_PATH=~/.pkgconfig.d
export GLOB_INC=$( pkg-config --cflags scifor dmft_ed)
export GLOB_LIB=$( pkg-config --libs scifor dmft_ed | sed "s/;/ /g" | sed 's/\\/ /g' )
export GLOB_INC=$( pkg-config --cflags scifor edipack2)
export GLOB_LIB=$( pkg-config --libs scifor edipack2 | sed "s/;/ /g" | sed 's/\\/ /g' )
cd EDIpack2/test
export TERM=xterm
make all
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# DMFTED PROJECT
##################################################
CMAKE_MINIMUM_REQUIRED(VERSION 3.0.0)
PROJECT(dmft_ed Fortran)
PROJECT(edipack2 Fortran)
SET(VERSION 0.4.7)


Expand Down Expand Up @@ -122,7 +122,7 @@ ADD_SUBDIRECTORY(${LIB_SRC}/ED_NONSU2)

ADD_SUBDIRECTORY(${LIB_SRC})

ADD_LIBRARY(dmft_ed STATIC
ADD_LIBRARY(edipack2 STATIC
$<TARGET_OBJECTS:ED_INIT_LIB>
$<TARGET_OBJECTS:ED_BATH_LIB>
$<TARGET_OBJECTS:ED_IO_LIB>
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# EDIpack2.0: Massively parallel Exact Diagonalization for generic Quantum Impurity problems

[![TestSuite](https://img.shields.io/github/actions/workflow/status/aamaricci/DMFT_ED/PushWorkflow.yml?label=TestSuite&logo=Fortran&style=flat-square)](https://github.com/aamaricci/DMFT_ED/actions/workflows/PushWorkflow.yml)
[![TestSuite](https://img.shields.io/github/actions/workflow/status/aamaricci/EDIpack2/PushWorkflow.yml?label=TestSuite&logo=Fortran&style=flat-square)](https://github.com/aamaricci/EDIpack2/actions/workflows/PushWorkflow.yml)

<!-- TO BE SETUP ASAP
[![Coverage]()]()
Expand All @@ -27,13 +27,13 @@ The code is based on:
### Installation

Installation is available using CMake. In the current v0.0.1 API are only provided in Fortran. In a future release Python and C/C++ API will be included.
The software gives acces to the static library `libdmft_ed.a` and the related modules `DMFT_ED`
The software gives acces to the static library `libedipack2.a` and the related modules `EDIPACK2`

Clone the repo:

`git clone https://github.com/aamaricci/EDIpack2.0`
`git clone https://github.com/aamaricci/EDIpack2.0 EDIpack2`

And from the repository directory (`cd EDIpack2.0`) make a standard out-of-source CMake compilation:
And from the repository directory (`cd EDIpack2`) make a standard out-of-source CMake compilation:

`mkdir build`
`cd build`
Expand All @@ -45,14 +45,14 @@ And from the repository directory (`cd EDIpack2.0`) make a standard out-of-sourc
Please follow the instructions on the screen to complete installation on your environment.
The library can be loaded using one of the following, automatically generated, files :

* pkg-config file in `~/.pkg-config.d/dmft_ed.pc`
* environment module file `~/.modules.d/dmft_ed/<PLAT>`
* pkg-config file in `~/.pkg-config.d/EDIpack2.pc`
* environment module file `~/.modules.d/EDIpack2/<PLAT>`
* homebrew `bash` script `<PREFIX>/bin/configvars.sh`


The `CMake` compilation can be controlled using the following additional variables, default values between `< >`:

* `-DPREFIX=prefix directory <~/opt/dmft_ed/VERSION/PLAT/[GIT_BRANCH]>`
* `-DPREFIX=prefix directory <~/opt/EDIpack2/VERSION/PLAT/[GIT_BRANCH]>`

* `-DUSE_MPI=<yes>/no`

Expand Down
20 changes: 0 additions & 20 deletions bin/ci_setup_dmft_ed.sh

This file was deleted.

20 changes: 20 additions & 0 deletions bin/ci_setup_edipack2.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#Building EDIpack2
#Errors
set -e

cd EDIpack2
mkdir build
cd build

echo "cmake .."
cmake ..

echo "make"
make

echo "make install"
make install

echo "source ~/opt/EDIpack2/gnu/*/bin/edipack2_config_user.sh" >> ~/.edipack2_config_user
echo -e "\e[32m EDIpack2 installed and sourced \e[0m"

4 changes: 2 additions & 2 deletions etc/dmft_ed.pc.in → etc/edipack2.pc.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ exec_prefix=${prefix}/bin
includedir=${prefix}/include
libdir=${prefix}/lib

Name: dmft_ed
Name: edipack2
Description: The EDIpack2.0 library
Cflags: -I${includedir}
Libs: -L${libdir} -ldmft_ed
Libs: -L${libdir} -ledipack2
Version:@VERSION@


File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion etc/environment_modules/module.in
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ proc ModulesHelp { } {
module-whatis "EDIpack2.0 library in Fortran"


setenv DMFT_ED_ROOT $root
setenv EDIPACK2_ROOT $root
setenv FC $compiler
setenv F90 $compiler
prepend-path LD_LIBRARY_PATH "$root/lib"
Expand Down
4 changes: 2 additions & 2 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# # DMFT_ED library
# EDIPACK2 library
#Generate version module:
CONFIGURE_FILE(${LIB_SRC}/revision.in ${LIB_SRC}/ED_VERSION.f90 @ONLY)

Expand All @@ -24,6 +24,6 @@ FILE(GLOB ED_GLOB_SRC
ED_CHI_FUNCTIONS.f90
ED_OBSERVABLES.f90
ED_MAIN.f90
DMFT_ED.f90
EDIPACK2.f90
)
ADD_LIBRARY(ED_GLOB_LIB OBJECT ${ED_GLOB_SRC})
6 changes: 3 additions & 3 deletions src/DMFT_ED.f90 → src/EDIPACK2.f90
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
MODULE DMFT_ED
MODULE EDIPACK2
USE ED_INPUT_VARS , only: &
ed_read_input , &
ed_update_input,&
Expand Down Expand Up @@ -76,7 +76,7 @@ MODULE DMFT_ED
ed_get_eknot , &
ed_get_doubles , &
ed_get_density_matrix


USE ED_MAIN, only: &
ed_init_solver , &
Expand All @@ -86,5 +86,5 @@ MODULE DMFT_ED
USE ED_BATH_FIT, only: ed_chi2_fitgf


END MODULE DMFT_ED
END MODULE EDIPACK2

2 changes: 1 addition & 1 deletion src/ED_BATH/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# DMFT_ED library
# EDIpack2 library
FILE(GLOB ED_BATH_SRC
ED_BATH_AUX.f90
ED_BATH_DIM.f90
Expand Down
2 changes: 1 addition & 1 deletion src/ED_IO/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# DMFT_ED library
# EDIpack2 library
FILE(GLOB ED_IO_SRC
ED_IO.f90
)
Expand Down
2 changes: 1 addition & 1 deletion src/ED_NONSU2/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# DMFT_ED library
# EDIpack2 library
FILE(GLOB ED_NONSU2_LIB_SRC
ED_HAMILTONIAN_NONSU2_COMMON.f90
ED_HAMILTONIAN_NONSU2_STORED_HxV.f90
Expand Down
2 changes: 1 addition & 1 deletion src/ED_NORMAL/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# DMFT_ED library
# EDIpack2 library
FILE(GLOB ED_NORMAL_LIB_SRC
ED_HAMILTONIAN_NORMAL_COMMON.f90
ED_HAMILTONIAN_NORMAL_STORED_HxV.f90
Expand Down
2 changes: 1 addition & 1 deletion src/ED_SUPERC/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# DMFT_ED library
# EDIpack2 library
FILE(GLOB ED_SUPERC_LIB_SRC
ED_HAMILTONIAN_SUPERC_COMMON.f90
ED_HAMILTONIAN_SUPERC_STORED_HxV.f90
Expand Down
4 changes: 2 additions & 2 deletions test/src/ED_GENERAL/ED_NORMAL/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ OBJS=../../ASSERTING.o

#NO NEED TO CHANGE DOWN HERE, only expert mode.
#########################################################################
GLOB_INC:=$(shell pkg-config --cflags dmft_ed scifor)
GLOB_LIB:=$(shell pkg-config --libs dmft_ed scifor | sed "s/;/ /g" | sed 's/\\/ /g')
GLOB_INC:=$(shell pkg-config --cflags edipack2 scifor)
GLOB_LIB:=$(shell pkg-config --libs edipack2 scifor | sed "s/;/ /g" | sed 's/\\/ /g')


ifeq ($(PLAT),intel)
Expand Down
2 changes: 1 addition & 1 deletion test/src/ED_GENERAL/ED_NORMAL/ed_general_normal.f90
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
program ed_general_normal
USE DMFT_ED
USE EDIPACK2
USE SCIFOR
USE MPI
USE SF_MPI
Expand Down
4 changes: 2 additions & 2 deletions test/src/ED_GENERAL/ED_SUPERC/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ OBJS=../../ASSERTING.o

#NO NEED TO CHANGE DOWN HERE, only expert mode.
#########################################################################
GLOB_INC:=$(shell pkg-config --cflags dmft_ed scifor)
GLOB_LIB:=$(shell pkg-config --libs dmft_ed scifor | sed "s/;/ /g" | sed 's/\\/ /g')
GLOB_INC:=$(shell pkg-config --cflags edipack2 scifor)
GLOB_LIB:=$(shell pkg-config --libs edipack2 scifor | sed "s/;/ /g" | sed 's/\\/ /g')


ifeq ($(PLAT),intel)
Expand Down
2 changes: 1 addition & 1 deletion test/src/ED_GENERAL/ED_SUPERC/ed_general_superc.f90
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
program ed_general_superc
USE DMFT_ED
USE EDIPACK2
USE SCIFOR
USE MPI
USE SF_MPI
Expand Down
2 changes: 1 addition & 1 deletion test/src/ED_GENERAL/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ FFLAGS= ${FFLAG} ${FPPMPI}
.SUFFIXES: .f90
.PHONY: clean

GLOB_INC:=$(shell pkg-config --cflags scifor dmft_ed)
GLOB_INC:=$(shell pkg-config --cflags scifor edipack2)

all: NORMAL SUPERC #NONSU2

Expand Down
2 changes: 1 addition & 1 deletion test/src/ED_HYBRID/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ FFLAGS= ${FFLAG} ${FPPMPI}
.SUFFIXES: .f90
.PHONY: clean

GLOB_INC:=$(shell pkg-config --cflags scifor dmft_ed)
GLOB_INC:=$(shell pkg-config --cflags scifor edipack2)


all:
Expand Down
4 changes: 2 additions & 2 deletions test/src/ED_NORMAL/ED_NORMAL/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ OBJS=../../ASSERTING.o

#NO NEED TO CHANGE DOWN HERE, only expert mode.
#########################################################################
GLOB_INC:=$(shell pkg-config --cflags dmft_ed scifor)
GLOB_LIB:=$(shell pkg-config --libs dmft_ed scifor | sed "s/;/ /g" | sed 's/\\/ /g')
GLOB_INC:=$(shell pkg-config --cflags edipack2 scifor)
GLOB_LIB:=$(shell pkg-config --libs edipack2 scifor | sed "s/;/ /g" | sed 's/\\/ /g')


ifeq ($(PLAT),intel)
Expand Down
2 changes: 1 addition & 1 deletion test/src/ED_NORMAL/ED_NORMAL/ed_normal_normal.f90
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
program ed_normal_normal
USE DMFT_ED
USE EDIPACK2
USE SCIFOR
USE MPI
USE SF_MPI
Expand Down
4 changes: 2 additions & 2 deletions test/src/ED_NORMAL/ED_SUPERC/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ OBJS=../../ASSERTING.o

#NO NEED TO CHANGE DOWN HERE, only expert mode.
#########################################################################
GLOB_INC:=$(shell pkg-config --cflags dmft_ed scifor)
GLOB_LIB:=$(shell pkg-config --libs dmft_ed scifor | sed "s/;/ /g" | sed 's/\\/ /g')
GLOB_INC:=$(shell pkg-config --cflags edipack2 scifor)
GLOB_LIB:=$(shell pkg-config --libs edipack2 scifor | sed "s/;/ /g" | sed 's/\\/ /g')


ifeq ($(PLAT),intel)
Expand Down
2 changes: 1 addition & 1 deletion test/src/ED_NORMAL/ED_SUPERC/ed_normal_superc.f90
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
program ed_normal_normal
USE DMFT_ED
USE EDIPACK2
USE SCIFOR
USE MPI
USE SF_MPI
Expand Down
2 changes: 1 addition & 1 deletion test/src/ED_NORMAL/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ FFLAGS= ${FFLAG} ${FPPMPI}
.SUFFIXES: .f90
.PHONY: clean

GLOB_INC:=$(shell pkg-config --cflags scifor dmft_ed)
GLOB_INC:=$(shell pkg-config --cflags scifor edipack2)

all: NORMAL SUPERC #NONSU2

Expand Down
4 changes: 2 additions & 2 deletions test/src/ED_REPLICA/ED_NORMAL/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ OBJS=../../ASSERTING.o

#NO NEED TO CHANGE DOWN HERE, only expert mode.
#########################################################################
GLOB_INC:=$(shell pkg-config --cflags dmft_ed scifor)
GLOB_LIB:=$(shell pkg-config --libs dmft_ed scifor | sed "s/;/ /g" | sed 's/\\/ /g')
GLOB_INC:=$(shell pkg-config --cflags edipack2 scifor)
GLOB_LIB:=$(shell pkg-config --libs edipack2 scifor | sed "s/;/ /g" | sed 's/\\/ /g')


ifeq ($(PLAT),intel)
Expand Down
2 changes: 1 addition & 1 deletion test/src/ED_REPLICA/ED_NORMAL/ed_replica_normal.f90
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
program ed_replica_normal
USE DMFT_ED
USE EDIPACK2
USE SCIFOR
USE MPI
USE SF_MPI
Expand Down
4 changes: 2 additions & 2 deletions test/src/ED_REPLICA/ED_SUPERC/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ OBJS=../../ASSERTING.o

#NO NEED TO CHANGE DOWN HERE, only expert mode.
#########################################################################
GLOB_INC:=$(shell pkg-config --cflags dmft_ed scifor)
GLOB_LIB:=$(shell pkg-config --libs dmft_ed scifor | sed "s/;/ /g" | sed 's/\\/ /g')
GLOB_INC:=$(shell pkg-config --cflags edipack2 scifor)
GLOB_LIB:=$(shell pkg-config --libs edipack2 scifor | sed "s/;/ /g" | sed 's/\\/ /g')


ifeq ($(PLAT),intel)
Expand Down
2 changes: 1 addition & 1 deletion test/src/ED_REPLICA/ED_SUPERC/ed_replica_superc.f90
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
program ed_replica_superc
USE DMFT_ED
USE EDIPACK2
USE SCIFOR
USE MPI
USE SF_MPI
Expand Down
2 changes: 1 addition & 1 deletion test/src/ED_REPLICA/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ FFLAGS= ${FFLAG} ${FPPMPI}
.SUFFIXES: .f90
.PHONY: clean

GLOB_INC:=$(shell pkg-config --cflags scifor dmft_ed)
GLOB_INC:=$(shell pkg-config --cflags scifor edipack2)

all: NORMAL SUPERC

Expand Down

0 comments on commit aecffe6

Please sign in to comment.