Preparing release 2.2

wrench-project · Jul 20, 2023 · aa46f69 · aa46f69
1 parent 0657839
commit aa46f69
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -57,6 +57,9 @@ examples/workflow_api/condor-grid-example/wrench-example-condor-grid-universe
 *wrench-example*
 examples/workflow_api/basic-examples/io-pagecache/wrench-example*
 
+# Generated REST API routes
+tools/wrench/wrench-daemon/include/routes.h
+
 #JSON
 host_utilization_layout.json
 
@@ -72,4 +75,4 @@ tools/wrench/wrench-daemon/include/REST_API_generated_code.h
 
 # Swagger-gen
 .swagger-codegen-ignore
-.swagger-codegen/
+.swagger-codegen/
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -36,7 +36,7 @@ set(CMAKE_CXX_STANDARD 17)
 set(WRENCH_VERSION_MAJOR "2")
 set(WRENCH_VERSION_MINOR "2")
 set(WRENCH_VERSION_PATCH "0")
-set(WRENCH_VERSION_EXTRA "dev")
+set(WRENCH_VERSION_EXTRA "")
 
 if (${WRENCH_VERSION_PATCH} EQUAL "0")
     set(WRENCH_RELEASE_VERSION "${WRENCH_VERSION_MAJOR}.${WRENCH_VERSION_MINOR}")

diff --git a/README.md b/README.md
@@ -42,7 +42,7 @@ And, one of the following:
 
 ### Required Dependencies 
 
-- [SimGrid](https://framagit.org/simgrid/simgrid/) - **master branch, commit tag 748fabf6540d3b6e2d58a36d0363985f0ddb85d9**
+- [SimGrid](https://framagit.org/simgrid/simgrid/) - version 3.24
 - [JSON for Modern C++](https://github.com/nlohmann/json) - version 3.9.0 or higher 
 
 ### Optional Dependencies
@@ -51,7 +51,7 @@ And, one of the following:
 - [Doxygen](http://www.doxygen.org) - version 1.8 or higher (only required for generating documentation)
 - [Sphinx](https://www.sphinx-doc.org/en/master/usage/installation.html) - version 4.5 or higher along with the following Python packages: `pip3 install sphinx-rtd-theme breathe recommonmark`  (only required for generating documentation)
 - [Batsched](https://gitlab.inria.fr/batsim/batsched) - version 1.4 - useful for expanded batch-scheduled resource simulation capabilities
-- [Asio](https://github.com/chriskohlhoff/asio/) - necessary only for building wrench-daemon
+- [Asio](https://github.com/chriskohlhoff/asio/) - necessary only for building `wrench-daemon`
 
 ## Building From Source
 

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -3,18 +3,19 @@ WRENCH Release Notes
 
 ### current master branch
 
+Nothing new yet
+
+### wrench 2.2
+
 - Implementation of `wrench-daemon`, which can be started on the local machine and supports a REST API so that users can create and run simulations in a language-agnostic manner.
 - Implementation of non-bufferized (i.e., buffer size of zero) storage services, which is transparent to the user but can vastly reduce simulation time by using a fluid (rather than message-based) model for how storage services read/write data to/from disk while sending/receiving that same data to/from the network. 
 - API change by which a `FileLocation` now includes a `DataFile`.
-- Added a CACHING_BEHAVIOR property to StorageService, which can take value "NONE" (the original behavior in which when full the storage service fails on writes) and "LRU" (the storage service implements a Least Recently Used strategy so as to function as a cache).
+- Added a `CACHING_BEHAVIOR` property to StorageService, which can take value `NONE` (the original behavior in which when full the storage service fails on writes) and `LRU` (the storage service implements a Least Recently Used strategy so as to function as a cache).
 - Implementation of a File Proxy Service, which acts as a proxy for a file service while maintaining a local cache for files.
 - Implementation of a Compound Storage Service, which acts as a proxy for an arbitrary set of Simple Storage Services and performs file striping.
 - Implementation of an MPI action, which can be part of any job and makes it possible to simulate message-passing programs implemented with the MPI API. The simulation of the MPI program is handled by the SMPI component is SimGrid, which has proven both accurate and scalable. 
 - Minor bug fixes and scalability improvements.
 
-
-**note**: master requires [simgrid](https://simgrid.org) master, commit tag 17ac6c61bd407825851b824adbfa28d64fb69587. 
-
 ### wrench 2.1
 
 (october 7, 2022) this release include **a new storage service implementation**, **performance enhancements**, and **minor bug fixes**. More specifically:

diff --git a/doc/source/installation.rst b/doc/source/installation.rst
@@ -22,7 +22,7 @@ And, one of the following: - **g++** - version 7.5 or higher - **clang**
 Required Dependencies
 ---------------------
 
--  `SimGrid <https://simgrid.org/>`__ – version 3.32
+-  `SimGrid <https://simgrid.org/>`__ – version 3.34
 -  `JSON for Modern C++ <https://github.com/nlohmann/json>`__ – version
    3.9.0 or higher
 
@@ -45,6 +45,7 @@ Optional Dependencies
 -  `Batsched <https://gitlab.inria.fr/batsim/batsched>`__ – version 1.4
    - useful for expanded batch-scheduled resource simulation
    capabilities
+-  `Asio <https://github.com/chriskohlhoff/asio/>`__ - tag 1.28.0 or later (only required for building `wrench-daemon`, WRENCH's REST API daemon)
 
 .. _install-source:
 

diff --git a/examples/workflow_api/real-workflow-example/SimpleWorkflowSimulator.cpp b/examples/workflow_api/real-workflow-example/SimpleWorkflowSimulator.cpp
@@ -13,9 +13,6 @@
 #include "SimpleWMS.h"
 #include <wrench/tools/wfcommons/WfCommonsWorkflowParser.h>
 
-static bool ends_with(const std::string &str, const std::string &suffix) {
-    return str.size() >= suffix.size() && 0 == str.compare(str.size() - suffix.size(), suffix.size(), suffix);
-}
 
 /**
  * @brief An example that demonstrate how to run a simulation of a simple Workflow

diff --git a/include/wrench/simulation/Version.h b/include/wrench/simulation/Version.h
@@ -9,5 +9,5 @@
  */
 
 namespace wrench {
-#define WRENCH_VERSION_STRING "2.2-dev"
+#define WRENCH_VERSION_STRING "2.2"
 }// namespace wrench