Update the containers to populate the HIP libraries to ldconfig.

ginkgo-project · Dec 11, 2019 · 92291c8 · 92291c8
1 parent 0ac84dc
commit 92291c8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/dev_tools/containers/ginkgo-cuda-base.py b/dev_tools/containers/ginkgo-cuda-base.py
@@ -124,3 +124,7 @@
 Stage0 += shell(commands=['cd /var/tmp/hipSPARSE', 'mkdir build', 'cd build',
                           'cmake -DBUILD_CUDA=on ..', 'make install'])
 Stage0 += shell(commands=['rm -rf /var/tmp/hipSPARSE'])
+
+# Populate the HIP environment variables
+Stage0 += environment(variables={'PATH': '$PATH:/opt/rocm/bin'})
+Stage0 += shell(commands=['echo "/opt/rocm/lib" > /etc/ld.so.conf.d/hip.conf && ldconfig'])
diff --git a/dev_tools/containers/ginkgo-nocuda-base.py b/dev_tools/containers/ginkgo-nocuda-base.py
@@ -68,7 +68,7 @@
                               'fancyvrb multirow hanging adjustbox xkeyval '
                               'collectbox stackengine etoolbox listofitems ulem '
                               'wasysym sectsty tocloft newunicodechar caption etoc '
-                              'pgf ec helvetic courier wasy'])
+                              'pgf ec helvetic courier wasy letltxmacro'])
 
 # Copy PAPI libs
 add_papi = USERARG.get('papi', 'False')

diff --git a/include/ginkgo/core/stop/criterion.hpp b/include/ginkgo/core/stop/criterion.hpp
@@ -279,7 +279,7 @@ using EnableDefaultCriterionFactory =
  * @internal For some abstract reason, nvcc compilation through HIP does not
  *           properly take into account the `using` declaration to inherit
  *           constructors. In addition, the default initialization `{}` for
- *           `_parameters_name##type $parameters` also does not work, which
+ *           `_parameters_name##type parameters` also does not work, which
  *           means the current form is probably the only correct one.
  *
  * @ingroup stop