Skip to content
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.

Sign up for GitHub

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

update birli, mwalib, wsclean #297

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

update birli, mwalib, wsclean #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
da3be25
update birli, mwalib, wsclean
d3v-null Nov 14, 2024
4c22e4e
update msrv
d3v-null Nov 14, 2024
7ebcd19
add hyperdrive peel and devel branch
d3v-null Nov 14, 2024
113b6ad
add hyperbeam 0.10, needs rust 1.80
d3v-null Nov 15, 2024
5c32820
Fixes compilation for [email protected].
dipietrantonio Dec 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions repo/packages/birli/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ class Birli(Package):
maintainers = ["d3v-null"]

version("main", branch="main")
version("0.16.0", tag="v0.16.0")
version("0.15.1", tag="v0.15.1")
version("0.14.0", tag="v0.14.0")
version("0.13.0", tag="v0.13.0")
Expand All @@ -20,6 +21,7 @@ class Birli(Package):
variant("portable", default=True, description="Disable native CPU optimizations")

depends_on("[email protected]:", type="build")
depends_on("[email protected]:", type="build", when="@0.16.0:")
depends_on("cmake", type="build")

# cfitsio > 4 introduces a breaking change, is incompatible with mwalib.
Expand Down
2 changes: 2 additions & 0 deletions repo/packages/hyperbeam/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ class Hyperbeam(Package, ROCmPackage, CudaPackage):
maintainers = ["d3v-null"]

version("main", branch="main")
version("0.10.0", tag="v0.10.0")
version("0.9.3", tag="v0.9.3")
version("0.8.0", tag="v0.8.0")
version("0.7.2", tag="v0.7.2")
Expand All @@ -32,6 +33,7 @@ class Hyperbeam(Package, ROCmPackage, CudaPackage):
variant("portable", default=True, description="Disable native CPU optimizations")

depends_on("[email protected]:", type="build")
depends_on("[email protected]:", type="build", when="@0.10.0:")
depends_on("cmake", type="build")

# cfitsio > 4 introduces a breaking change, is incompatible with mwalib.
Expand Down
2 changes: 2 additions & 0 deletions repo/packages/hyperdrive/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ class Hyperdrive(Package, ROCmPackage, CudaPackage):

version("main", branch="main")
version("0.4.1", tag="v0.4.1")
version("0.4.1-peel", tag="v0.4.1-peel")
version("0.4.1-devel", tag="v0.4.1-devel")

# unknown issue on setonix when enabled https://github.com/PawseySC/pawsey-spack-config/pull/280#issuecomment-2296128762
variant("cfitsio-static", default=False, description="Enable the fitsio_src feature of the fitsio-sys crate.")
Expand Down
2 changes: 2 additions & 0 deletions repo/packages/mwalib/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ class Mwalib(Package):
maintainers = ["d3v-null"]

version("main", branch="main")
version("1.8.2", tag="v1.8.2")
version("1.5.0", tag="v1.5.0")
version("1.4.0", tag="v1.4.0")
version("1.3.3", tag="v1.3.3")
Expand All @@ -32,6 +33,7 @@ class Mwalib(Package):
variant("portable", default=True, description="Disable native CPU optimizations")

depends_on("[email protected]:", type="build")
depends_on("[email protected]:", type="build", when="@1.8:")

# cfitsio > 4 introduces a breaking change, is incompatible with mwalib.
# default spack cfitsio does not give the +reentrant option
Expand Down
24 changes: 24 additions & 0 deletions repo/packages/wsclean/mpiv3.5.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
diff --git a/distributed/mpibig.cpp b/distributed/mpibig.cpp
index 2b69035..dbf8a93 100644
--- a/distributed/mpibig.cpp
+++ b/distributed/mpibig.cpp
@@ -4,6 +4,7 @@

#include <algorithm>
#include <cstdint>
+#include <cstddef>

using aocommon::Logger;

diff --git a/distributed/mpibig.h b/distributed/mpibig.h
index 47d0bbc..c6f2270 100644
--- a/distributed/mpibig.h
+++ b/distributed/mpibig.h
@@ -2,6 +2,7 @@
#define DISTRIBUTED_MPI_BIG_H_

#include <mpi.h>
+#include <cstddef>

namespace wsclean {

7 changes: 5 additions & 2 deletions repo/packages/wsclean/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ class Wsclean(CMakePackage):

maintainers = ['dipietrantonio']

version('3.5', git='https://gitlab.com/aroffringa/wsclean.git', tag='v3.5', submodules=True)
version('3.4', git='https://gitlab.com/aroffringa/wsclean.git', tag='v3.4', submodules=True)
version('3.3', git='https://gitlab.com/aroffringa/wsclean.git', tag='v3.3', submodules=True)
version('3.2', git='https://gitlab.com/aroffringa/wsclean.git', tag='v3.2', submodules=True)
Expand All @@ -44,13 +45,15 @@ class Wsclean(CMakePackage):
depends_on('[email protected]', when='@3.2 +everybeam')
depends_on('[email protected]', when='@3.3 +everybeam')
depends_on('[email protected]:0.5.8', when='@3.4 +everybeam')
depends_on('[email protected]', when='@3.5 +everybeam')
depends_on('mpi', when='+mpi')
depends_on('blas', when='@3.0:')
depends_on('doxygen', when='@3.0:')
depends_on('python', when='@3.0:')
patch("wsclean_2.10.1.patch", when="@2.10.1")
patch('mpi1.patch', when='@3.0:')
patch('mpi2.patch', when='@3.0:')
patch('mpi1.patch', when='@3.0:3.4')
patch('mpi2.patch', when='@3.0:3.4')
patch('mpiv3.5.patch', when='@3.5:')

@run_before("cmake")
def change_source_dir(self):
Expand Down