diff --git a/.github/workflows/ci-devel.yaml b/.github/workflows/ci-devel.yaml
deleted file mode 100644
index 3ccca8aabed6359c63a56901c69ba7f27b62e60e..0000000000000000000000000000000000000000
--- a/.github/workflows/ci-devel.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-name: CI-devel
-on: [push]
-jobs:
- gcc:
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v1
- - name: apt-get install packages
- run: sudo apt-get update -qq &&
- sudo apt-get install --no-install-recommends -y
- gcc
- git
- libyaml-dev
- make
- valgrind
- - name: build
- run: make
- - name: test
- run: make test
- - name: valgrind test
- run: make valgrind-quiet
- - name: sanitize test
- run: make VARIANT=san test
- clang:
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v1
- - name: apt-get install packages
- run: sudo apt-get update -qq &&
- sudo apt-get install --no-install-recommends -y
- clang
- git
- libyaml-dev
- make
- valgrind
- - name: build
- run: make CC=clang
- - name: test
- run: make test CC=clang
- - name: valgrind test
- run: make valgrind-quiet CC=clang
- - name: sanitize test
- run: make CC=clang VARIANT=san test
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
deleted file mode 100644
index ec2c38ade7621a98104950c606b3d17fbe575fcd..0000000000000000000000000000000000000000
--- a/.github/workflows/ci.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-name: CI
-on:
- push:
- branches:
- - master
-jobs:
- gcc:
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v1
- - name: apt-get install packages
- run: sudo apt-get update -qq &&
- sudo apt-get install --no-install-recommends -y
- gcc
- git
- libyaml-dev
- make
- valgrind
- - name: build
- run: make
- - name: test
- run: make test
- - name: valgrind test
- run: make valgrind-quiet
- - name: sanitize test
- run: make VARIANT=san test
- clang:
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v1
- - name: apt-get install packages
- run: sudo apt-get update -qq &&
- sudo apt-get install --no-install-recommends -y
- clang
- git
- libyaml-dev
- make
- valgrind
- - name: build
- run: make CC=clang
- - name: test
- run: make test CC=clang
- - name: valgrind test
- run: make valgrind-quiet CC=clang
- - name: sanitize test
- run: make CC=clang VARIANT=san test
diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml
deleted file mode 100644
index 3c50b75cd623db327e1d7cc0edf167e9297e883e..0000000000000000000000000000000000000000
--- a/.github/workflows/coverage.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-name: Coverage
-on:
- pull_request:
- branches:
- - master
- push:
- branches:
- - master
-jobs:
- coverage:
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v1
- - name: Setup Python
- uses: actions/setup-python@master
- with:
- version: 3.7
- - name: apt-get install packages
- run: sudo apt-get update -qq &&
- sudo apt-get install --no-install-recommends -y
- gcc
- gcovr
- git
- libyaml-dev
- make
- - name: coverage test
- run: make coverage
- - name: filter output
- run: find build/coverage -name "*.gc*" -type f -delete;
- - name: upload coverage
- uses: codecov/codecov-action@v1.0.3
- with:
- token: ${{secrets.CODECOV_TOKEN}}
- file: build/coverage.xml
- flags: unittests
- name: codecov-umbrella
diff --git a/INSTALL.md b/INSTALL.md
index 3fe61e8187fbba2ff1a3bc1ee3d3019054e327df..6b24a1b230a41297284b36fa9f46b05566d5cd23 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -1,21 +1,8 @@
-
# Prerequisites
You will need a `C compiler` capable of understanding `C11`, as well as `posix threads`.
Also, you will need `autoreconf` and `libtool` for configuring Maestro build system.
-
-deps/c-timestamp
-deps/libcyaml
-deps/libfabric
-deps/libyaml
-deps/mamba
-deps/mio
-deps/protobuf
-deps/protobuf-c
-
-
-
#### Subtree projects and updates
We are including a number of external dependency libraries as subtrees in our tree under `./deps/`
@@ -76,18 +63,6 @@ automake's test infrastructure:
This will start a single-node exclusive job for each individual test, and each will get a different DRC
token.
-#### jupiter system
-Do not use one of the `craype-network-ofi\*` modules at this time.
-`libfabric` builds nicely with CCE 9.0.
-
-### sage prototype
-Please load the following modules before configuring/building.
-
-```
-module use $CLIENT_MOD_PATH
-module swap gnu GCC/9.3.0
-module load Autotools git binutils pkg-config libreadline
-```
## Calling autoreconf
@@ -115,7 +90,7 @@ Be sure to use `CC=cc` on the configure line.
By default, the OFI conductor will be built. To enable the experimental other variants
`--enable-mpi-pool-manager` or `--enable-smp-pool-manager` at configure time (INCOMPLETE).
-We are also including Version 0.1.0 of the Mamba library in deps/mamba, and a snapshot of MIO in deps/mio.
+We are also including Version 0.1.8 of the Mamba library in deps/mamba, and a snapshot of MIO in deps/mio.
To use MIO you need to add the `--with-mio` flag at configure time, and have MERO installed on the system.
diff --git a/LICENSE b/LICENSE
index 490120aee196b8a8688f928af992e236daff1882..bc115f84d19ec27adcf05c34120f9f49751a94e5 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,3 +1,4 @@
+Copyright © 2023 Hewlett Packard Enterprise Development LP
Copyright (C) 2019 Cray Computer GmbH
Redistribution and use in source and binary forms, with or without
diff --git a/README.md b/README.md
index 093e574483809eab6802e29d3d75b7cd6c1cb3ec..33442f605ec33179954e4ebbf5b304887b32f062 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
Maestro is a data- and memory-aware middleware framework that addresses the ubiquitous problems of data movement in complex memory hierarchies that exist at multiple levels of the HPC software stack.
-<img alt="Maestro architecture overview image" src="docs/maestro-arch-overview.png">
+<img alt="Maestro architecture overview image" src="maestro-arch-overview.png">
This repository contains the Maestro Core Library.
diff --git a/benchmark/visu_pool_local_multi.p b/benchmark/visu_pool_local_multi.p
deleted file mode 100644
index 6d7108e7c94c054736dc19e4a94e054588c55f4b..0000000000000000000000000000000000000000
--- a/benchmark/visu_pool_local_multi.p
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright (C) 2020 Cray Computer GmbH
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# 3. Neither the name of the copyright holder nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-# PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-set terminal png
-set output "ju_diff100k.png"
-set font "Helvetica"
-set title 'Juelich/issue6/1; jupiter; BW; rep1; diff100k; /=decl\_per\_cdo'
-set key right
-set log y
-set xlabel "declarations per CDO"
-set ylabel "time (ms)"
-set style function linespoints
-plot 'pool_local_multi.dat' using 2:xtic(1) title "1 thread" with linespoints, '' using 3 title "4 threads" with linespoints, '' using 4 title "8 threads" with linespoints, '' using 5 title "12 threads" with linespoints, '' using 8 title "24 threads" with linespoints
diff --git a/benchmark/visu_pool_local_multi.sh b/benchmark/visu_pool_local_multi.sh
deleted file mode 100755
index eb1f2a2170954a93c60f52b450e119b58cc16c71..0000000000000000000000000000000000000000
--- a/benchmark/visu_pool_local_multi.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/env bash
-#
-# Post-treatment and visualization of ../tests/check_pool_local_multi
-#
-
-# Copyright (C) 2020 Cray Computer GmbH
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# 3. Neither the name of the copyright holder nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-# PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-output="pool_local_multi.dat"
-gnuplot_script="visu_pool_local_multi.p"
-
-../tests/check_pool_local_multi > tmp
-
-# remove the first two lines and the last three lines (written by `cheat`)
-head -n -3 tmp | sed -e '1,2d' > $output
-
-gnuplot $gnuplot_script
diff --git a/docs/maestro-arch-overview.png b/maestro-arch-overview.png
similarity index 100%
rename from docs/maestro-arch-overview.png
rename to maestro-arch-overview.png