[Libxc] update to version 7.0.0 #9910
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change | ||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -5,61 +5,53 @@ include(joinpath(YGGDRASIL_DIR, "fancy_toys.jl")) | |||||||||||||||||
| include(joinpath(YGGDRASIL_DIR, "platforms", "cuda.jl")) | ||||||||||||||||||
|
|
||||||||||||||||||
| name = "Libxc_GPU" | ||||||||||||||||||
| version = v"7.0.0" | ||||||||||||||||||
| include("../sources.jl") | ||||||||||||||||||
|
|
||||||||||||||||||
| # Bash recipe for building GPU version | ||||||||||||||||||
| # Notes: | ||||||||||||||||||
| # - 3rd and 4th derivatives (KXC, LXC) not built since gives a binary size of ~200MB | ||||||||||||||||||
| script = raw""" | ||||||||||||||||||
|
|
||||||||||||||||||
| cd $WORKSPACE/srcdir/libxc-*/ | ||||||||||||||||||
|
|
||||||||||||||||||
| mkdir libxc_build | ||||||||||||||||||
| cd libxc_build | ||||||||||||||||||
|
|
||||||||||||||||||
| mv ${WORKSPACE}/destdir/cuda/lib ${WORKSPACE}/destdir/cuda/lib64 | ||||||||||||||||||
|
|
||||||||||||||||||
| cmake -DCMAKE_INSTALL_PREFIX=$prefix -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TARGET_TOOLCHAIN}\ | ||||||||||||||||||
| -DCMAKE_BUILD_TYPE=Release -DENABLE_XHOST=OFF -DBUILD_SHARED_LIBS=ON \ | ||||||||||||||||||
| -DENABLE_CUDA=ON -DCMAKE_CUDA_COMPILER=$prefix/cuda/bin/nvcc \ | ||||||||||||||||||
|
There was a problem hiding this comment. libxc is using ... but for unknown reasons, it seems There was a problem hiding this comment. None of the There was a problem hiding this comment. Did you try setting CUDA_PATH? |
||||||||||||||||||
| -DBUILD_TESTING=OFF -DENABLE_FORTRAN=OFF \ | ||||||||||||||||||
| -DDISABLE_KXC=ON .. | ||||||||||||||||||
|
There was a problem hiding this comment. Breaking lists into separate parts and sorting them is good practice (helps shorten future diffs etc.):
Suggested change
This should of course be extended for the entire cmake "configure" call, but GitHub prevents making a suggestion for the entire cmake configure call (due to some deleted lines, apparently). |
||||||||||||||||||
|
|
||||||||||||||||||
| make -j${nproc} | ||||||||||||||||||
| make install | ||||||||||||||||||
| """ | ||||||||||||||||||
|
|
||||||||||||||||||
| # Override the default platforms | ||||||||||||||||||
| platforms = CUDA.supported_platforms(; min_version=v"11.4") | ||||||||||||||||||
| filter!(p -> arch(p) == "x86_64", platforms) | ||||||||||||||||||
|
|
||||||||||||||||||
| # The products that we will ensure are always built | ||||||||||||||||||
| products = [ | ||||||||||||||||||
| LibraryProduct("libxc", :libxc) | ||||||||||||||||||
| ] | ||||||||||||||||||
|
|
||||||||||||||||||
| # Dependencies that must be installed before this package can be built | ||||||||||||||||||
| dependencies = [ | ||||||||||||||||||
| Dependency(PackageSpec(name="CompilerSupportLibraries_jll", uuid="e66e0078-7015-5450-92f7-15fbd957f2ae")) | ||||||||||||||||||
|
There was a problem hiding this comment. Please don't make unrelated unneeded and undesired cosmetic changes such as removing trailing commas that are there for a very good reason (i.e. not to break git blame when adding new lines)
Suggested change
|
||||||||||||||||||
| ] | ||||||||||||||||||
|
|
||||||||||||||||||
| # Build Libxc for all supported CUDA toolkits | ||||||||||||||||||
| for platform in platforms | ||||||||||||||||||
| should_build_platform(triplet(platform)) || continue | ||||||||||||||||||
|
|
||||||||||||||||||
| cuda_deps = CUDA.required_dependencies(platform; static_sdk=true) | ||||||||||||||||||
|
|
||||||||||||||||||
| build_tarballs(ARGS, name, version, sources, script, [platform], | ||||||||||||||||||
| products, [dependencies; cuda_deps]; lazy_artifacts=true, | ||||||||||||||||||
| julia_compat="1.8", augment_platform_block=CUDA.augment, preferred_gcc_version=v"8", | ||||||||||||||||||
| skip_audit=true, dont_dlopen=true) | ||||||||||||||||||
| end | ||||||||||||||||||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| # Sources required for all builds | ||
| sources = [ | ||
| ArchiveSource("https://gitlab.com/libxc/libxc/-/archive/$(version)/libxc-$(version).tar.gz", | ||
| "8d4e343041c9cd869833822f57744872076ae709a613c118d70605539fb13a77"), | ||
| ] |
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.
Doesn't this leave leftovers in the final tarballs? Why do you need to move it?
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.
CMake looks for the cuda installation in
cuda/lib64rather thancuda/lib. Other CUDA packages either do this, or they create a symlink. I'm happy to change for the latter, if it is indeed cleaner.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 point is that the tarball has a
cudadirectory full of empty subdirectories. That shouldn't exist at all.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.
Cleaned-up. It looks like the offending line was
skip_audit=true, dont_dlopen=truein the arguments of thebuild_tarball()function. I am not sure what it did, but it does not seem necessary. I successfully tested the new build as well.