From 89c9597c91d549cc40179d8e04d5bc1942f76f90 Mon Sep 17 00:00:00 2001
From: chillenzer <107195608+chillenzer@users.noreply.github.com>
Date: Wed, 28 Aug 2024 12:50:36 +0100
Subject: [PATCH] Release 2.6.0 (#260)

* Update .zenodo.json

* Prepare changelog for release 2.6.0
---
 .zenodo.json | 65 ++++++++++++++++++++++++++++++----------------------
 CHANGELOG.md | 37 ++++++++++++++++++++++++++++++
 2 files changed, 74 insertions(+), 28 deletions(-)

diff --git a/.zenodo.json b/.zenodo.json
index fd42bd88..9b23ff13 100644
--- a/.zenodo.json
+++ b/.zenodo.json
@@ -1,52 +1,61 @@
 {
-  "title":"mallocMC - Memory Allocator for Many Core Architectures",
-  "description":"This project provides a framework for fast memory managers on many core accelerators. It is based on alpaka to run on many different accelerators and implements the ScatterAlloc algorithm.",
-  "keywords":[
+  "title": "mallocMC - Memory Allocator for Many Core Architectures",
+  "description": "This project provides a framework for fast memory managers on many core accelerators. It is based on alpaka to run on many different accelerators and implements multiple algorithms.",
+  "keywords": [
     "mallocMC",
     "CUDA",
     "manycore",
     "GPU",
     "allocator"
   ],
-  "language":"eng",
-  "access_right":"open",
-  "license":{
-    "id":"MIT"
+  "language": "eng",
+  "access_right": "open",
+  "license": {
+    "id": "MIT"
   },
-  "creators":[
+  "creators": [
     {
-      "name":"Eckert, Carlchristian",
-      "affiliation":"Helmholtz-Zentrum Dresden-Rossendorf, TU Dresden",
-      "orcid":"0000-0002-6459-0842"
+      "name": "Widera, René",
+      "affiliation": "Helmholtz-Zentrum Dresden-Rossendorf",
+      "orcid": "0000-0003-1642-0459"
     },
     {
-      "name":"Widera, René",
-      "affiliation":"Helmholtz-Zentrum Dresden-Rossendorf",
-      "orcid":"0000-0003-1642-0459"
+      "name": "Lenz, Julian",
+      "affiliation": "CASUS, Helmholtz-Zentrum Dresden-Rossendorf",
+      "orcid": "0000-0001-5250-0005"
     },
     {
-      "name":"Huebl, Axel",
-      "affiliation":"Helmholtz-Zentrum Dresden-Rossendorf",
-      "orcid":"0000-0003-1943-7141"
+      "name": "Huebl, Axel",
+      "affiliation": "Helmholtz-Zentrum Dresden-Rossendorf",
+      "orcid": "0000-0003-1943-7141"
     },
     {
-      "name":"Gruber, Bernhard Manfred",
-      "affiliation":"Helmholtz-Zentrum Dresden-Rossendorf, CASUS, CERN",
-      "orcid":"0000-0001-7848-1690"
+      "name": "Gruber, Bernhard Manfred",
+      "affiliation": "Helmholtz-Zentrum Dresden-Rossendorf, CASUS, CERN",
+      "orcid": "0000-0001-7848-1690"
     },
     {
-      "name":"Bastrakov, Sergei",
-      "affiliation":"Helmholtz-Zentrum Dresden-Rossendorf",
-      "orcid":"0000-0003-3396-6154"
+      "name": "Bastrakov, Sergei",
+      "affiliation": "Helmholtz-Zentrum Dresden-Rossendorf",
+      "orcid": "0000-0003-3396-6154"
+    }
+  ],
+  "contributors": [
+    {
+      "name": "Eckert, Carlchristian",
+      "affiliation": "Helmholtz-Zentrum Dresden-Rossendorf, TU Dresden",
+      "orcid": "0000-0002-6459-0842",
+      "type": "Other"
     },
     {
-      "name":"Worpitz, Benjamin"
+      "name": "Worpitz, Benjamin",
+      "type": "Other"
     },
     {
-      "name":"Grund, Alexander",
-      "affiliation":"Helmholtz-Zentrum Dresden-Rossendorf",
-      "orcid":"0000-0002-7196-8452"
+      "name": "Grund, Alexander",
+      "affiliation": "Helmholtz-Zentrum Dresden-Rossendorf",
+      "orcid": "0000-0002-7196-8452",
+      "type": "Other"
     }
   ]
 }
-
diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd06fcdb..9f6b5d4d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,43 @@
 Change Log / Release Log for mallocMC
 ================================================================
 
+2.6.0
+-----
+
+Date: 2024-08-28
+
+This is mostly a maintenance release.
+Years of production use in PIConGPU have surfaced
+a number of bugs and inconsistencies that are addressed.
+We will drop the 'crp' suffix in our version numbers
+because the original version
+(that we distinguished from via 'crp')
+is no longer maintained.
+
+Features
+
+- Compatibility with C++20
+- Use runtime selected number of access blocks
+- Full support for CPU accelerators
+- Scatter: optimize page search algorithm
+- Scatter: optimize hash and allocation size
+- Scatter: add more informations to `classname()`
+
+Bug fixes
+
+- Scatter: Various deadlocks, data races and inconsistencies
+- Compilation failure without `alpaka_ACC_GPU_CUDA_ONLY_MODE` set
+- Adjustments to the examples to compile and run cleanly again
+- Alignment violation in edge cases of small allocations fixed
+- Remove undefined behaviour in handling bit masks
+
+Maintenance
+
+- Update to alpaka 1.1.0
+- Minor adjustments in the README
+- Scatter: Internal refactorings
+- CI fixes
+
 2.5.0crp
 --------
 **Date:** 2021-02-18