Merge branch 'devel' into co_deepCenter

.github/workflows/build.yml

@@ -10,7 +10,7 @@ jobs:
 
     # Avoid send statistics
     env:
-      SEND_INSTALLATION_STATISTICS: "OFF"
+      SEND_INSTALLATION_STATISTICS: OFF
 
     steps:    
     - name: Checkout repository
@@ -66,4 +66,5 @@ jobs:
       env:
         BUILD_TESTS: True
         BRANCH_NAME: ${{ github.head_ref }}
+        SEND_INSTALLATION_STATISTICS: OFF 
       run: ../scipion/scipion3 run ./xmipp -b $BRANCH_NAME --keep-output || (cat compilation.log && false)

CHANGELOG.md

@@ -1,5 +1,13 @@
-## Release 3.XX.YY - TBD
-
+## Release 3.24.12 - P
+   - New protocols
+      - ..
+   - Protocols updated
+      - ..
+   - Protocols fixed
+      -  ..
+   - Protocols deprecated (For more details visit [this](https://github.com/I2PC/xmipp/wiki/Deprecating-programs-and-protocols))
+      - ..
+   - More scipion-em-xmipp
 
 ## Release 3.24.06 - Oceanus
    - New protocols
@@ -31,7 +39,7 @@
       - metaprotocol_golden_highres
       - solid_angle
       - split_volume
-   - More scipio-em-xmipp
+   - More scipion-em-xmipp
       - Solve Sonar Cloud reported bugs
       - Flexible import of pyQT on chimera script
       - Removing tkAgg matplotlib requirement in viewer_structure_map
@@ -61,7 +69,7 @@
       - classification_gpuCorr
       - classification_gpuCorr_full
       - classification_gpuCorr_semi
-   - More scipio-em-xmipp
+   - More scipion-em-xmipp
       - Updated Nvidia driver required version
 
 

xmipp3/protocols/__init__.py

@@ -64,6 +64,7 @@
 from .protocol_extract_asymmetric_unit import XmippProtExtractUnit
 from .protocol_helical_parameters import XmippProtHelicalParameters
 from .protocol_kerdensom import XmippProtKerdensom
+from .protocol_mics_defocus_balancer import XmippProtMicDefocusSampler
 from .protocol_ml2d import XmippProtML2D
 from .protocol_movie_gain import XmippProtMovieGain
 from .protocol_movie_alignment_consensus import XmippProtConsensusMovieAlignment

xmipp3/protocols/protocol_classify_pca.py

@@ -291,8 +291,10 @@ def _validate(self):
             errors.append("You should resize the particles."
                           " Sizes smaller than 128 pixels are recommended.")
         er = self.validateDLtoolkit()
+        if not isinstance(er, list):
+            er = [er]
         if er:
-            errors.append(er)
+            errors+=er
         return errors
 
     def _warnings(self):

xmipp3/protocols/protocol_classify_pca_streaming.py

@@ -331,6 +331,7 @@ def _setEnvVariables(self, env):
         # Limit the number of threads
         env['OMP_NUM_THREADS'] = '12'
         env['MKL_NUM_THREADS'] = '12'
+        env['PYTORCH_CUDA_ALLOC_CONF'] = 'expandable_segments:True'
         return env
 
     def _updateFnClassification(self):