-
Notifications
You must be signed in to change notification settings - Fork 1
Update of all packages to new releases #7
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.
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
Open
pfadler
wants to merge
44
commits into
hmenke:master
Choose a base branch
from
pfadler:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
44 commits
Select commit
Hold shift + click to select a range
84a0ba6
New triqs version
126b1ad
mpi version increase
e405c5a
update patch
5074828
gtest dependency
6ea9ec6
first set of patches fixed, ld broken
f377924
new version cpp2py
3d6c7cc
new dependencies
434d487
new version and updated patches
8eb6818
add cppdlr
f3cc421
missing include for cppdlr
ec579ef
correct dependency for triqs 3.3 release
745ba25
Add python support for triqs tests
2efd0ee
new dependencies for 3.3
c1fc95b
version bump
ab4490f
bump flake
71db52a
fmt search for triqs
76b8ba4
update cthyb for 3.3
4b2bdae
changes for 3.3.1
c43bd80
maxent -> 3.3.0
e707000
pyed new release
42a0dfa
new version for omegamaxent interface
99e553b
added dependency necessary for import wo triqs
f800da8
moved tprf buildinputs to triqs propagated
90f08ad
tprf needs hdf5
00828c0
amend sha of cppdlr
pfadler 190851e
New version necessitates fftwf
28054d7
some issues with gtest and cpp11
65ba207
new version
f536b17
new pomerol version
4c0bb34
new interface version
e07dd7d
new alps version
6d139c5
alps cthyb new version
15b26e4
use cpp14 for testing
b936d72
proper openmpi oversubscribe
6f466dc
self as maintainer
6478169
cppdlr implicit dependency propagation
2b96650
already propagated
5776229
consistent capitalization
d437d8c
remove superfluous buildinput
8cb11e8
remove comment and empty list
b50b851
unnecessary buildinputs
c3ec440
remove strange fftwf dependency
d4893eb
no propagation of build dependencies
b56b1e3
move instead of remove inputs
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -5,7 +5,7 @@ cmake_minimum_required (VERSION 3.1) | ||
| # gftools use only CXX compiler | ||
| project (GFTools CXX) | ||
|
|
||
| -set(CMAKE_CXX_STANDARD 11) | ||
| +set(CMAKE_CXX_STANDARD 14) | ||
| set(CMAKE_CXX_STANDARD_REQUIRED ON) | ||
| set(CMAKE_CXX_EXTENSIONS OFF) | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt | ||
| index 6db2571..54f2ef0 100644 | ||
| --- a/deps/CMakeLists.txt | ||
| +++ b/deps/CMakeLists.txt | ||
| @@ -51,7 +51,6 @@ endif() | ||
| external_dependency(GTest | ||
| GIT_REPO https://github.com/google/googletest | ||
| GIT_TAG main | ||
| - BUILD_ALWAYS | ||
| EXCLUDE_FROM_ALL | ||
| ) | ||
|
|
||
| @@ -64,7 +63,6 @@ external_dependency(nda | ||
| ) | ||
|
|
||
| # -- fmt -- | ||
| -set(FMT_INSTALL ON) | ||
| external_dependency(fmt | ||
| GIT_REPO https://github.com/fmtlib/fmt | ||
| GIT_TAG 11.0.2 | ||
| diff --git a/share/cmake/cppdlr-config.cmake.in b/share/cmake/cppdlr-config.cmake.in | ||
| index f2cf6e6..1ab7aee 100644 | ||
| --- a/share/cmake/cppdlr-config.cmake.in | ||
| +++ b/share/cmake/cppdlr-config.cmake.in | ||
| @@ -24,7 +24,7 @@ endfunction() | ||
| find_dep(nda 1.2) | ||
|
|
||
| # Include the exported targets of this project | ||
| -include(@CMAKE_INSTALL_PREFIX@/@FMT_CMAKE_DIR@/fmt-targets.cmake) | ||
| +include(@fmt_DIR@/fmt-targets.cmake) | ||
| include(@CMAKE_INSTALL_FULL_LIBDIR@/cmake/@PROJECT_NAME@/@PROJECT_NAME@-targets.cmake) | ||
|
|
||
| message(STATUS "Found @PROJECT_NAME@-config.cmake with version @PROJECT_VERSION@, hash = @PROJECT_GIT_HASH@, root = @CMAKE_INSTALL_PREFIX@") | ||
| diff --git a/test/c++/CMakeLists.txt b/test/c++/CMakeLists.txt | ||
| index eff56af..ffe6eac 100644 | ||
| --- a/test/c++/CMakeLists.txt | ||
| +++ b/test/c++/CMakeLists.txt | ||
| @@ -18,7 +18,7 @@ foreach(test ${all_tests}) | ||
| get_filename_component(test_name ${test} NAME_WE) | ||
| get_filename_component(test_dir ${test} DIRECTORY) | ||
| add_executable(${test_name} ${test}) | ||
| - target_link_libraries(${test_name} ${PROJECT_NAME}::${PROJECT_NAME}_c ${PROJECT_NAME}_warnings gtest_main) | ||
| + target_link_libraries(${test_name} ${PROJECT_NAME}::${PROJECT_NAME}_c ${PROJECT_NAME}_warnings gtest gtest_main) | ||
| set_property(TARGET ${test_name} PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${test_dir}) | ||
| add_test(NAME ${test_name} COMMAND ${test_name} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${test_dir}) | ||
| # Run clang-tidy if found |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| { stdenv | ||
| , lib | ||
| , fetchFromGitHub | ||
| , cmake | ||
| , gtest | ||
| , triqsPackages | ||
| , fmt | ||
| , python3Packages | ||
| , openblasCompat | ||
| , hdf5 | ||
| , mpi | ||
| }: | ||
|
|
||
| stdenv.mkDerivation rec { | ||
| pname = "cppdlr"; | ||
| version = "1.1.0"; | ||
|
|
||
| src = fetchFromGitHub { | ||
| owner = "flatironinstitute"; | ||
| repo = pname; | ||
| rev = version; | ||
| sha256 = "sha256-PxZtJifJotQtON+bEVGelXl/G9jxxfV5WmD6UJlhtLU="; | ||
| }; | ||
|
|
||
| patches = [ ./cppdlr.patch ]; | ||
| cmakeFlags = [ "-DBuild_Deps=Never" ]; | ||
| nativeBuildInputs = [ cmake gtest ]; | ||
| buildInputs = [ | ||
| hdf5 | ||
| mpi | ||
| openblasCompat | ||
| fmt | ||
| ]; | ||
|
|
||
| propagatedBuildInputs = [ | ||
| triqsPackages.h5 | ||
| triqsPackages.nda | ||
| ]; | ||
|
|
||
| doCheck = true; | ||
|
|
||
| meta = { | ||
| description = "Discrete Lehmann representation of imaginary time Green's functions"; | ||
| homepage = "https://github.com/flatironinstitute/cppdlr"; | ||
| license = lib.licenses.asl20; | ||
| maintainers = with lib.maintainers; [ pfadler ]; | ||
| }; | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does cppdlr really depend on all of these? As far as I can see it only depends on
ndaandh5.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think i wrongly interpreted the error message of a failing build of cppdlr complaining about some missing dependencies. That might however be due to these being dependencies of the dependencies that are not properly propagated. I will have a look into that
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the installation of cppdlr automatically installs nda and therefore expects its dependencies (itertools, cpp2py and mpi) to be available. I have moved them from buildInputs to propagatedBuildInputs in the nda package or are they rather suited for propagatedNativeBuildInputs?