Skip to content

Commit 7f0d6ab

Browse files
klevzoffcorbett5rrsettgast
authored
Remove unneeded doxygen return tags in some constructors (#202)
* Remove unneeded doxygen return tags in some constructors * Minor sphinx changes. * update TPL paths Co-authored-by: Benjamin Curtice Corbett <[email protected]> Co-authored-by: Randolph R. Settgast <[email protected]>
1 parent 44391e1 commit 7f0d6ab

File tree

8 files changed

+11
-14
lines changed

8 files changed

+11
-14
lines changed

docs/sphinx/tensorOps.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ Operation
196196
:math:`\mathbf{S} \leftarrow \mathbf{Q}^-1` ``tensorOps::symInvert< m >( S, Q )``
197197
:math:`\mathbf{S} \leftarrow \mathbf{S}^-1` ``tensorOps::symInvert< m >( S )``
198198
:math:`x \leftarrow \mathbf{S} \mathbf{A}^T = diag(x) \mathbf{A}^T` ``tensorOps::symEigenvalues< M >( x, S )``
199-
:math:`x, \mathbf{A} \leftarrow \mathbf{S} \mathbf{A}^T = diag(x) \mathbf{A}^T` ``tensorOps::symEigenvalues< M >( x, S )``
199+
:math:`x, \mathbf{A} \leftarrow \mathbf{S} \mathbf{A}^T = diag(x) \mathbf{A}^T` ``tensorOps::symEigenvectors< M >( x, S )``
200200
================================================================================ ==============================================
201201

202202
There are also two function ``tensorOps::denseToSymmetric`` and ``tensorOps::symmetricToDense`` which convert between dense and symmetric matrix representation.

docs/sphinx/testing.rst

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ Testing
44

55
Testing is a crucial component of writing quality software and the nature LvArray lends itself nicely to unit tests.
66

7-
Building and running the test
8-
-----------------------------
7+
Building and Running the Tests
8+
------------------------------
99
Tests are built by default, to disable the tests set the CMake variable ``ENABLE_TESTS`` to ``OFF``. The tests are output in the ``tests`` folder of the build directory.
1010

1111
To run all the tests run ``make test`` in the build directory. To run a specific set of tests that match the regular expression ``REGEX`` run ``ctest -V -R REGEX``, to run just ``testCRSMatrix`` run ``./tests/testCRSMatrix``. LvArray uses `Google Test`_ for the testing framework and each test accepts a number of command line arguments.
@@ -73,13 +73,13 @@ The most useful of these is ``gtest_filter`` which lets you run a subset of test
7373

7474
Test structure
7575
--------------
76-
The source for all the tests are all located in the ``unitTests`` directory, each tests consists of a ``cpp`` whose name begins with ``test`` followed by the name of the class or namespace that is tested. For example the tests for ``CRSMatrix`` and ``CRSMatrixView`` are in ``unitTests/testCRSMatrix.cpp`` and the tests for ``sortedArrayManipulation`` are in ``unitTests/testSortedArrayManipulation.cpp``.
76+
The source for all the tests are all located in the ``unitTests`` directory, each tests consists of a ``cpp`` file whose name begins with ``test`` followed by the name of the class or namespace that is tested. For example the tests for ``CRSMatrix`` and ``CRSMatrixView`` are in ``unitTests/testCRSMatrix.cpp`` and the tests for ``sortedArrayManipulation`` are in ``unitTests/testSortedArrayManipulation.cpp``.
7777

7878
.. note::
7979
The tests for ``LvArray::Array``, ``LvArray::ArrayView`` and ``LvArray::tensorOps`` are spread across multiple ``cpp`` files in order to speed up compilation on multithreaded systems.
8080

81-
Adding a new test
82-
---------------------
81+
Adding a New Test
82+
-----------------
8383
Any time new functionality is added it should be tested. Before writing any test code it is highly recommended you familiarize yourself with the Google Test framework, see the `Google Test primer`_ and `Google Test advanced`_ documentation.
8484

8585
As an example say you add a new class ``Foo``
@@ -168,12 +168,11 @@ Best practices
168168
- Whenever possible use typed tests.
169169
- Whenever possible do not write CUDA (or OpenMP) specific tests. Instead write tests a typed test that is templated on the RAJA policy and use a typed test to instantiate it with the appropriate policies.
170170
- When linking to gtest it is not necessary to include the ``main`` function in the executable because if it is not there ``gtest`` will link in its own ``main``. However you should include ``main`` in each test file to ease debugging. Furthermore if the executable needs some setup or cleanup such as initializing MPI it should be done in main. Note that while it is certainly possible to write tests which take command line arguments it is discouraged because then ``./tests/testThatTakesCommandLineArguments`` no longer works.
171-
- For commonly called functions define a macro which first calls ``SCOPED_TRACE`` and then the the function. This helps illuminate exactly where errors are occuring.
171+
- For commonly called functions define a macro which first calls ``SCOPED_TRACE`` and then the the function. This helps illuminate exactly where errors are occurring.
172172
- Prefer the ``EXPECT_`` family of macros to the ``ASSERT_`` family.
173173
- Use the most specific ``EXPECT_`` macro applicable. So don't do ``EXPECT_TRUE( bar() == 5 )`` instead use ``EXPECT_EQ( bar(), 5 )``
174174

175175
.. _`Google Test`: https://github.com/google/googletest/tree/306f3754a71d6d1ac644681d3544d06744914228
176176
.. _`Google Test primer`: https://github.com/google/googletest/blob/306f3754a71d6d1ac644681d3544d06744914228/googletest/docs/primer.md
177177
.. _`Google Test advanced`: https://github.com/google/googletest/blob/306f3754a71d6d1ac644681d3544d06744914228/googletest/docs/advanced.md
178178
.. _`typed tests`: https://github.com/google/googletest/blob/306f3754a71d6d1ac644681d3544d06744914228/googletest/docs/advanced.md#typed-tests
179-

host-configs/LLNL/lassen-base.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Set up the tpls
22
set(GEOSX_TPL_ROOT_DIR /usr/gapps/GEOSX/thirdPartyLibs CACHE PATH "")
3-
set(GEOSX_TPL_DIR ${GEOSX_TPL_ROOT_DIR}/2020-10-08/install-${CONFIG_NAME}-release CACHE PATH "")
3+
set(GEOSX_TPL_DIR ${GEOSX_TPL_ROOT_DIR}/2020-10-15/install-${CONFIG_NAME}-release CACHE PATH "")
44

55
set(RAJA_DIR ${GEOSX_TPL_DIR}/raja CACHE PATH "")
66

host-configs/LLNL/[email protected]

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
set(CONFIG_NAME "lassen-clang@upstream" CACHE PATH "")
22

3+
34
set(COMPILER_DIR /usr/tce/packages/clang/clang-upstream-2019.03.26 )
45
set(CMAKE_C_COMPILER ${COMPILER_DIR}/bin/clang CACHE PATH "")
56
set(CMAKE_CXX_COMPILER ${COMPILER_DIR}/bin/clang++ CACHE PATH "")
67

8+
79
# C++ options
810
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG -mcpu=powerpc64le -mtune=powerpc64le" CACHE STRING "")
911
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g ${CMAKE_CXX_FLAGS_RELEASE}" CACHE STRING "")

host-configs/LLNL/quartz-base.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
set(ENABLE_FORTRAN OFF CACHE BOOL "")
22

33
set(GEOSX_TPL_ROOT_DIR /usr/gapps/GEOSX/thirdPartyLibs CACHE PATH "")
4-
set(GEOSX_TPL_DIR ${GEOSX_TPL_ROOT_DIR}/2020-10-08/install-${CONFIG_NAME}-release CACHE PATH "")
4+
set(GEOSX_TPL_DIR ${GEOSX_TPL_ROOT_DIR}/2020-10-15/install-${CONFIG_NAME}-release CACHE PATH "")
55

66
set(RAJA_DIR ${GEOSX_TPL_DIR}/raja CACHE PATH "")
77

src/Array.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ class Array : public ArrayView< T,
114114
* @brief Copy constructor.
115115
* @param source object to copy.
116116
* @note Performs a deep copy of source
117-
* @return *this.
118117
*/
119118
LVARRAY_HOST_DEVICE
120119
Array( Array const & source ):

src/ArrayOfSets.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ class ArrayOfSets : protected ArrayOfSetsView< T, INDEX_TYPE, BUFFER_TYPE >
7272

7373
/**
7474
* @brief Default move constructor, performs a shallow copy.
75-
* @return *this.
7675
*/
7776
inline
7877
ArrayOfSets( ArrayOfSets && ) = default;

src/ArrayView.hpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ class ArrayView
120120
* @param source The object to copy.
121121
* @note Triggers the copy constructor for @tparam BUFFER_TYPE. When using the
122122
* ChaiBuffer this can move the underlying buffer to a new memory space if the execution context is set.
123-
* @return *this
124123
*/
125124
DISABLE_HD_WARNING
126125
inline LVARRAY_HOST_DEVICE constexpr
@@ -134,7 +133,6 @@ class ArrayView
134133
/**
135134
* @brief Move constructor, creates a shallow copy and invalidates the source.
136135
* @param source object to move.
137-
* @return *this.
138136
* @note Since this invalidates the source this should not be used when @p source is
139137
* the parent of an Array. Do not do this:
140138
* @code

0 commit comments

Comments
 (0)