[med-svn] [Git][med-team/relion][debian/master] fix more typos in cuda code paths
Andreas Beckmann (@anbe)
gitlab at salsa.debian.org
Thu Sep 29 16:23:07 BST 2022
Andreas Beckmann pushed to branch debian/master at Debian Med / relion
Commits:
b20e39bb by Andreas Beckmann at 2022-09-29T14:14:03+02:00
fix more typos in cuda code paths
- - - - -
1 changed file:
- debian/patches/typos.patch
Changes:
=====================================
debian/patches/typos.patch
=====================================
@@ -129,3 +129,54 @@ Description: fix typos found by Lintian
if (fn_out[fn_out.size() - 1] != '/')
fn_out += "/";
+--- a/src/acc/cuda/cuda_autopicker.cu
++++ b/src/acc/cuda/cuda_autopicker.cu
+@@ -346,7 +346,7 @@ void AutoPickerCuda::autoPickOneMicrogra
+ {
+ have_warned_batching = true;
+ std::cerr << std::endl << "*-----------------------------WARNING------------------------------------------------*"<< std::endl;
+- std::cerr << "With the current settings the GPU memory is imposing a soft limit on your performace," << std::endl;
++ std::cerr << "With the current settings the GPU memory is imposing a soft limit on your performance," << std::endl;
+ std::cerr << "since one or more micrographs has to use (at least " << cudaTransformer1.batchSize.size() << ") batches of orientations to "<< std::endl;
+ std::cerr << "achieve the total requested " << Npsi << " orientations. Consider using" << std::endl;
+ std::cerr << "\t higher --ang" << std::endl;
+--- a/src/error.h
++++ b/src/error.h
+@@ -155,13 +155,13 @@ Remember that the numbering of GPUs star
+
+ #define ERRGPUKERN ("\n\
+ A GPU-function failed to execute.\n\n \
+-If this occured at the start of a run, you might have GPUs which\n\
++If this occurred at the start of a run, you might have GPUs which\n\
+ are incompatible with either the data or your installation of relion.\n\
+ If you \n\n\
+ \t-> INSTALLED RELION YOURSELF: if you e.g. specified -DCUDA_ARCH=50\n\
+ \t and are trying ot run on a compute 3.5 GPU (-DCUDA_ARCH=3.5), \n\
+ \t this may happen.\n\n\
+-\t-> HAVE MULTIPLE GPUS OF DIFFERNT VERSIONS: relion needs GPUS with\n\
++\t-> HAVE MULTIPLE GPUS OF DIFFERENT VERSIONS: relion needs GPUS with\n\
+ \t at least compute 3.5. You may be trying to use a GPU older than\n\
+ \t this. If you have multiple generations, try specifying --gpu <X>\n\
+ \t with X=0. Then try X=1 in a new run, and so on. The numbering of\n\
+--- a/src/gpu_utils/cuda_autopicker.cu
++++ b/src/gpu_utils/cuda_autopicker.cu
+@@ -329,7 +329,7 @@ void AutoPickerCuda::autoPickOneMicrogra
+ {
+ have_warned_batching = true;
+ std::cerr << std::endl << "*-----------------------------WARNING------------------------------------------------*"<< std::endl;
+- std::cerr << "With the current settings the GPU memory is imposing a soft limit on your performace," << std::endl;
++ std::cerr << "With the current settings the GPU memory is imposing a soft limit on your performance," << std::endl;
+ std::cerr << "since one or more micrographs has to use (at least " << cudaTransformer1.batchSize.size() << ") batches of orientations to "<< std::endl;
+ std::cerr << "achieve the total requested " << Npsi << " orientations. Consider using" << std::endl;
+ std::cerr << "\t higher --ang" << std::endl;
+--- a/tests/catch2/catch.hpp
++++ b/tests/catch2/catch.hpp
+@@ -8206,7 +8206,7 @@ namespace Catch {
+ if ( !exceptions.empty() ) {
+ m_startupExceptions = true;
+ Colour colourGuard( Colour::Red );
+- Catch::cerr() << "Errors occured during startup!" << '\n';
++ Catch::cerr() << "Errors occurred during startup!" << '\n';
+ // iterate over all exceptions and notify user
+ for ( const auto& ex_ptr : exceptions ) {
+ try {
View it on GitLab: https://salsa.debian.org/med-team/relion/-/commit/b20e39bb8aca668eb8f4543417b1e13db7309442
--
View it on GitLab: https://salsa.debian.org/med-team/relion/-/commit/b20e39bb8aca668eb8f4543417b1e13db7309442
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20220929/f678e194/attachment-0001.htm>
More information about the debian-med-commit
mailing list