From a31c88c579c8d0026e0025de8bace0cf22f6305b Mon Sep 17 00:00:00 2001 From: Cyrus Harrison Date: Thu, 26 Jan 2023 19:23:44 -0800 Subject: [PATCH] update docs for 0.9.0 release (#1077) --- CHANGELOG.md | 13 +++-- LICENSE | 2 +- scripts/generate_license_cpp_header.py | 5 +- src/CMakeLists.txt | 2 +- src/docs/sphinx/Releases.rst | 48 ++++++++++++++++++ src/docs/sphinx/conf.py | 6 +-- src/libs/ascent/ascent_license.hpp | 68 ++------------------------ 7 files changed, 69 insertions(+), 75 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0351d32b1..322c3b674 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,13 +5,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project aspires to adhere to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## Unreleased +## [0.9.0] - Released 2023-01-12 -### Preferred dependency versions for ascent@develop -- conduit@0.8.4 +### Preferred dependency versions for ascent@0.9.0 +- conduit@0.8.6 - vtk-m@1.9.0 ### Added +- Added support for HIP and running on AMD GPUs +- Added RAJA expressions infrastructure - Added pipeline `partition` transform from Conduit Blueprint - Added extract `flatten` from Conduit Blueprint - Added Log base 10 filter. Filter type is `log10` @@ -167,7 +169,10 @@ and this project aspires to adhere to [Semantic Versioning](https://semver.org/s ### Fixed - Several minor bug fixes -[Unreleased]: https://github.com/Alpine-DAV/ascent/compare/v0.6.0...HEAD +[Unreleased]: https://github.com/Alpine-DAV/ascent/compare/v0.9.0...HEAD +[0.8.0]: https://github.com/Alpine-DAV/ascent/compare/v0.8.0...v0.9.0 +[0.7.1]: https://github.com/Alpine-DAV/ascent/compare/v0.7.0...v0.7.1 +[0.7.0]: https://github.com/Alpine-DAV/ascent/compare/v0.6.0...v0.7.0 [0.6.0]: https://github.com/Alpine-DAV/ascent/compare/v0.5.1...v0.6.0 [0.5.1]: https://github.com/Alpine-DAV/ascent/compare/v0.5.0...v0.5.1 [0.5.0]: https://github.com/Alpine-DAV/ascent/compare/v0.4.0...v0.5.0 diff --git a/LICENSE b/LICENSE index c6a8b91dd..31b9ca2d4 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2015-2022, Lawrence Livermore National Security, LLC. +Copyright (c) 2015-2023, Lawrence Livermore National Security, LLC. Produced at the Lawrence Livermore National Laboratory diff --git a/scripts/generate_license_cpp_header.py b/scripts/generate_license_cpp_header.py index 5d3e13b96..cc1d5cb1e 100644 --- a/scripts/generate_license_cpp_header.py +++ b/scripts/generate_license_cpp_header.py @@ -25,8 +25,9 @@ def gen_lic_hpp(lic_file,hpp_out): # write the lic prelude, then create var to use in c++ hpp_f = open(hpp_out,"w") hpp_f.write(pattern["hdr"]) - for l in lic_txt: - hpp_f.write("%s%s" % (pattern["st"],l)) + hpp_f.write("// Copyright (c) Lawrence Livermore National Security, LLC and other Ascent\n") + hpp_f.write("// Project developers. See top-level LICENSE AND COPYRIGHT files for dates and\n") + hpp_f.write("// other details. No copyright assignment is required to contribute to Ascent.\n") hpp_f.write(pattern["hdr"]) hpp_f.write("\n") hpp_f.write("#ifndef ASCENT_LICENSE_TEXT_HPP\n") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 46c3e5a67..694583a38 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -11,7 +11,7 @@ cmake_policy(SET CMP0048 NEW) # Ascent ################################ -project(ascent VERSION "0.8.0") +project(ascent VERSION "0.9.0") ################################ # Build Options diff --git a/src/docs/sphinx/Releases.rst b/src/docs/sphinx/Releases.rst index 88cee84fa..3c19ce38e 100644 --- a/src/docs/sphinx/Releases.rst +++ b/src/docs/sphinx/Releases.rst @@ -20,6 +20,54 @@ Source distributions for Ascent are hosted on github: https://github.com/Alpine-DAV/ascent/releases +v0.9.0 +--------------------------------- + +* `Source Tarball `__ + +* Docker Containers + * ``alpinedav/ascent:0.9.0`` + * ``alpinedav/ascent-jupyter:0.9.0`` + +Highlights +++++++++++++++++++++++++++++++++++++ + +(Extracted from Ascent's :download:`Changelog <../../../CHANGELOG.md>`) + + +Preferred dependency versions for ascent@0.9.0 +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + * conduit@0.8.6 + * vtk-m@1.9.0 + +Added +~~~~~ + + * Added support for HIP and running on AMD GPUs + * Added RAJA expressions infrastructure + * Added pipeline ``partition`` transform from Conduit Blueprint + * Added extract ``flatten`` from Conduit Blueprint + * Added Log base 10 filter. Filter type is ``log10`` + * Added Log base 2 filter. Filter type is ``log2`` + * Added Feature Map in the docs. Detailing Devil Ray and VTKh features + * Added ``scripts/build_ascent/build_ascent.sh`` a script that demonstrates how to manually build Ascent and its main dependencies + * Added ability to override dimensions for the rendered bounding box around a dataset + * Added CMake option ``ENABLE_HIDDEN_VISIBILITY`` (default=ON), which controls if hidden visibility is used for private symbols + * Added documentation for how to use ROCm's rocprof profiler for GPUs with Ascent + * Added support for Caliper performance annotations + * Added automatic slice filter that evaluates a number of slices and outputs the one with the highest entropy + +Changed +~~~~~~~ + + * **The Great Amalgamation** - The VTK-h, Devil Ray, and AP Compositor projects are now developed in Ascent's source instead of separate repos. These external repos for these projects are archived. This reorg simplifies the development and support of these tightly coupled capabilities. Ascent 0.9.0 will be the first release using these internal versions. + * ``apcomp``, ``dray``, ``flow``, ``rover``, and ``vtkh`` are now developed in ``src/libs``. + * Updated to VTK-m 1.9 + * Update docs related to building Ascent. + * Updated to BLT v0.5.2 + + v0.8.0 --------------------------------- diff --git a/src/docs/sphinx/conf.py b/src/docs/sphinx/conf.py index 79b46e637..c12d96708 100644 --- a/src/docs/sphinx/conf.py +++ b/src/docs/sphinx/conf.py @@ -57,16 +57,16 @@ # General information about the project. project = u'Ascent' -copyright = u'2015-2022, LLNS' +copyright = u'2015-2023, LLNS' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the # built documents. # # The short X.Y version. -version = '0.8.0' +version = '0.9.0' # The full version, including alpha/beta/rc tags. -release = '0.8.0' +release = '0.9.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/src/libs/ascent/ascent_license.hpp b/src/libs/ascent/ascent_license.hpp index e5acc652f..d879a9576 100644 --- a/src/libs/ascent/ascent_license.hpp +++ b/src/libs/ascent/ascent_license.hpp @@ -1,73 +1,13 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~// -// Copyright (c) 2015-2022, Lawrence Livermore National Security, LLC. -// -// Produced at the Lawrence Livermore National Laboratory -// -// LLNL-CODE-716457 -// -// All rights reserved. -// -// This file is part of Ascent. -// -// For details, see: http://ascent.readthedocs.io/. -// -// Please also read ascent/LICENSE -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are met: -// -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the disclaimer below. -// -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the disclaimer (as noted below) in the -// documentation and/or other materials provided with the distribution. -// -// * Neither the name of the LLNS/LLNL 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 LAWRENCE LIVERMORE NATIONAL SECURITY, -// LLC, THE U.S. DEPARTMENT OF ENERGY 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. -// -// Additional BSD Notice -// -// 1. This notice is required to be provided under our contract with the U.S. -// Department of Energy (DOE). This work was produced at Lawrence -// Livermore National Laboratory under Contract No. DE-AC52-07NA27344 with -// the DOE. -// -// 2. Neither the United States Government nor Lawrence Livermore National -// Security, LLC nor any of their employees, makes any warranty, express -// or implied, or assumes any liability or responsibility for the -// accuracy, completeness, or usefulness of any information, apparatus, -// product, or process disclosed, or represents that its use would not -// infringe privately-owned rights. -// -// 3. Also, reference herein to any specific commercial products, process, -// or services by trade name, trademark, manufacturer or otherwise does -// not necessarily constitute or imply its endorsement, recommendation, -// or favoring by the United States Government or Lawrence Livermore -// National Security, LLC. The views and opinions of authors expressed -// herein do not necessarily state or reflect those of the United -// States Government or Lawrence Livermore National Security, LLC, and -// shall not be used for advertising or product endorsement purposes. +// Copyright (c) Lawrence Livermore National Security, LLC and other Ascent +// Project developers. See top-level LICENSE AND COPYRIGHT files for dates and +// other details. No copyright assignment is required to contribute to Ascent. //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~// #ifndef ASCENT_LICENSE_TEXT_HPP #define ASCENT_LICENSE_TEXT_HPP -std::string ASCENT_LICENSE_TEXT = "Copyright (c) 2015-2022, Lawrence Livermore National Security, LLC.\n" +std::string ASCENT_LICENSE_TEXT = "Copyright (c) 2015-2023, Lawrence Livermore National Security, LLC.\n" "\n" "Produced at the Lawrence Livermore National Laboratory\n" "\n"