meson, scripts, workflows: Enable libfabric (#124)

parcio · Jan 29, 2022 · e2a2cba · e2a2cba
1 parent 31187d7
commit e2a2cba
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -109,7 +109,7 @@ jobs:
           sudo apt --yes --purge autoremove
           sudo aa-remove-unknown
           sudo apt update || true
-          sudo apt --yes --no-install-recommends install ninja-build pkgconf libglib2.0-dev libbson-dev liblmdb-dev libsqlite3-dev libleveldb-dev libmongoc-dev libmariadb-dev librocksdb-dev libfuse3-dev libopen-trace-format-dev librados-dev
+          sudo apt --yes --no-install-recommends install ninja-build pkgconf libglib2.0-dev libbson-dev libfabric-dev liblmdb-dev libsqlite3-dev libleveldb-dev libmongoc-dev libmariadb-dev librocksdb-dev libfuse3-dev libopen-trace-format-dev librados-dev
           sudo apt --yes --no-install-recommends install python3 python3-pip python3-setuptools python3-wheel
           sudo pip3 install meson
       - name: Cache dependencies
@@ -198,6 +198,10 @@ jobs:
           - os:
               dist: ubuntu-18.04
             dependencies: system
+          # libfabric is too old on Ubuntu 20.04
+          - os:
+              dist: ubuntu-20.04
+            dependencies: system
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -211,7 +215,7 @@ jobs:
           sudo apt --yes --purge autoremove
           sudo aa-remove-unknown
           sudo apt update || true
-          sudo apt --yes --no-install-recommends install ninja-build pkgconf libglib2.0-dev libbson-dev liblmdb-dev libsqlite3-dev libleveldb-dev libmongoc-dev libmariadb-dev librocksdb-dev libfuse3-dev libopen-trace-format-dev librados-dev
+          sudo apt --yes --no-install-recommends install ninja-build pkgconf libglib2.0-dev libbson-dev libfabric-dev liblmdb-dev libsqlite3-dev libleveldb-dev libmongoc-dev libmariadb-dev librocksdb-dev libfuse3-dev libopen-trace-format-dev librados-dev
           sudo apt --yes --no-install-recommends install python3 python3-pip python3-setuptools python3-wheel
           sudo pip3 install meson
       - name: Cache dependencies

diff --git a/meson.build b/meson.build
@@ -90,8 +90,8 @@ endif
 # CentOS 7 has GLib 2.42, CentOS 7.6 has GLib 2.56
 # Ubuntu 18.04 has GLib 2.56
 glib_version = '2.56'
-# Ubuntu 18.04 has libfabric 1.5.3
-libfabric_version = '1.5.3'
+# Ubuntu 22.04 has libfabric 1.11.0
+libfabric_version = '1.11.0'
 # Ubuntu 18.04 has libbson 1.9.2
 libbson_version = '1.9.0'
 
@@ -354,7 +354,7 @@ configure_file(
 
 # Build
 
-common_deps = [m_dep, glib_dep, gio_dep, gmodule_dep, gthread_dep, gobject_dep, libbson_dep, otf_dep]
+common_deps = [m_dep, glib_dep, gio_dep, gmodule_dep, gthread_dep, gobject_dep, libbson_dep, libfabric_dep, otf_dep]
 
 # FIXME Remove core directory
 julea_incs = include_directories([

diff --git a/scripts/spack b/scripts/spack
@@ -97,7 +97,7 @@ spack_get_dependencies ()
 	# Mandatory dependencies
 	dependencies="${dependencies} glib"
 	dependencies="${dependencies} libbson"
-	#dependencies="${dependencies} libfabric#fabrics=sockets,tcp,udp,verbs,rxd,rxm"
+	dependencies="${dependencies} libfabric#fabrics=sockets,tcp,udp,verbs,rxd,rxm"
 
 	# Recommended dependencies
 	dependencies="${dependencies} [email protected]:"