Merge branch 'no-explicit-simd-arch' into 'master'

Remove use of explicity specified SIMD backends

See merge request !1439

Hlt/Hlt1Conf/python/Hlt1Conf/algorithms.py

@@ -15,10 +15,6 @@ from PyConf.Algorithms import (
     CombineTracksSIMD__2Body__PrFittedForwardTracksWithMuonID,
     CombineTracksSIMD__3Body__PrFittedForwardTracksWithPVs,
     CombineTracksSIMD__3Body__PrFittedForwardTracksWithMuonID,
-    CombineTracksSIMD__2Body__PrFittedForwardTracksWithPVs_SSE,
-    CombineTracksSIMD__2Body__PrFittedForwardTracksWithMuonID_SSE,
-    CombineTracksSIMD__3Body__PrFittedForwardTracksWithPVs_SSE,
-    CombineTracksSIMD__3Body__PrFittedForwardTracksWithMuonID_SSE,
     CombineTracksSIMD__2Body__PrFittedForwardTracksWithPVs_Scalar,
     CombineTracksSIMD__2Body__PrFittedForwardTracksWithMuonID_Scalar,
     CombineTracksSIMD__3Body__PrFittedForwardTracksWithPVs_Scalar,
@@ -86,7 +82,7 @@ def CombineTracks(InputTracks,
         name.
     Backend : str
         Level of vectorisation to target in the combiner. Valid values are
-        'Best', 'SSE' and 'Scalar'.
+        'Best', and 'Scalar'.
     CombinationCut : Functors.Functor
         Functor to be applied to the N-track combination object.
     Combination12Cut : Functors.Functor
@@ -100,22 +96,16 @@ def CombineTracks(InputTracks,
     candidate_configurables = [
         # LHCb::Pr::Fitted::Forward::Tracks zipped with PV relations
         (CombineTracksSIMD__2Body__PrFittedForwardTracksWithPVs, 2, 'Best'),
-        (CombineTracksSIMD__2Body__PrFittedForwardTracksWithPVs_SSE, 2, 'SSE'),
         (CombineTracksSIMD__2Body__PrFittedForwardTracksWithPVs_Scalar, 2,
          'Scalar'),
         (CombineTracksSIMD__3Body__PrFittedForwardTracksWithPVs, 3, 'Best'),
-        (CombineTracksSIMD__3Body__PrFittedForwardTracksWithPVs_SSE, 3, 'SSE'),
         (CombineTracksSIMD__3Body__PrFittedForwardTracksWithPVs_Scalar, 3,
          'Scalar'),
         # LHCb::Pr::Fitted::Forward::Tracks zipped with muon PIDs
         (CombineTracksSIMD__2Body__PrFittedForwardTracksWithMuonID, 2, 'Best'),
-        (CombineTracksSIMD__2Body__PrFittedForwardTracksWithMuonID_SSE, 2,
-         'SSE'),
         (CombineTracksSIMD__2Body__PrFittedForwardTracksWithMuonID_Scalar, 2,
          'Scalar'),
         (CombineTracksSIMD__3Body__PrFittedForwardTracksWithMuonID, 3, 'Best'),
-        (CombineTracksSIMD__3Body__PrFittedForwardTracksWithMuonID_SSE, 3,
-         'SSE'),
         (CombineTracksSIMD__3Body__PrFittedForwardTracksWithMuonID_Scalar, 3,
          'Scalar'),
     ]

Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm_thor/b_to_dh_thor.py

@@ -169,31 +169,6 @@ def DsmToHHH_ThOrBest_line(name='Hlt2B2OC_DsmToHHH_ThOrBest_Line'):
     return HltLine(name=name, algs=b2oc_prefilters() + [d])
 
 
-@register_line_builder(all_lines)
-@configurable
-def DsmToHHH_ThOrSSE_line(name='Hlt2B2OC_DsmToHHH_ThOrSSE_Line'):
-    functor_backend = 'ThOr'
-    make_zip = False
-
-    particles = {}
-    particles["pions"] = basic_builder.make_pions(
-        functor_backend=functor_backend,
-        make_zip=make_zip,
-    )
-    particles["kaons"] = basic_builder.make_kaons(
-        functor_backend=functor_backend,
-        make_zip=make_zip,
-    )
-
-    d = d_builder.make_dsplus_to_hhh(
-        particles=particles,
-        functor_backend='ThOr',
-        combiner='ThOrCombiner',
-        alg_backend='SSE',
-        make_pvs=make_v2_pvs)
-    return HltLine(name=name, algs=b2oc_prefilters() + [d])
-
-
 @register_line_builder(all_lines)
 @configurable
 def DsmToHHH_ThOrScalar_line(name='Hlt2B2OC_DsmToHHH_ThOrScalar_Line'):

Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm_thor/builders/b_builder.py

@@ -26,13 +26,10 @@ from PyConf.Algorithms import (
     ThOrCombiner__3Particle,
     ThOrCombiner__4Particle,
     ThOrCombiner__CompositesChargedBasics,
-    ThOrCombinerSSE__CompositesChargedBasics,
     ThOrCombinerScalar__CompositesChargedBasics,
     ThOrCombiner__Composites2ChargedBasics,
-    ThOrCombinerSSE__Composites2ChargedBasics,
     ThOrCombinerScalar__Composites2ChargedBasics,
     ThOrCombiner__Composites3ChargedBasics,
-    ThOrCombinerSSE__Composites3ChargedBasics,
     ThOrCombinerScalar__Composites3ChargedBasics,
 )
 
@@ -115,11 +112,6 @@ def make_b2x(
                 3: ThOrCombiner__Composites2ChargedBasics,
                 4: ThOrCombiner__Composites3ChargedBasics,
             },
-            'SSE': {
-                2: ThOrCombinerSSE__CompositesChargedBasics,
-                3: ThOrCombinerSSE__Composites2ChargedBasics,
-                4: ThOrCombinerSSE__Composites3ChargedBasics,
-            },
             'Scalar': {
                 2: ThOrCombinerScalar__CompositesChargedBasics,
                 3: ThOrCombinerScalar__Composites2ChargedBasics,
@@ -224,7 +216,7 @@ def make_b2chh(
 
     assert functor_backend in {'LoKi', 'ThOr'}
     assert combiner in {'LoKi3Body', 'ThOrCombiner', 'ThOrLHCbParticle'}
-    assert alg_backend in {'Best', 'SSE', 'Scalar', 'Particle'}
+    assert alg_backend in {'Best', 'Scalar', 'Particle'}
 
     def loki_thor(loki, thor):
         return loki.format(
@@ -293,7 +285,6 @@ def make_b2chh(
         assert len(particles) == 3
         alg = {
             'Best': ThOrCombiner__Composites2ChargedBasics,
-            'SSE': ThOrCombinerSSE__Composites2ChargedBasics,
             'Scalar': ThOrCombinerScalar__Composites2ChargedBasics,
             'Particle': ThOrCombiner__3Particle,
         }[alg_backend]

Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm_thor/builders/basic_builder.py

@@ -28,9 +28,8 @@ from PyConf.Algorithms import (
     Vertex_v1_to_v2, LHCb__Converters__Track__v2__fromV1TrackV2Track as
     v2TrackConverter, ThreeBodyCombiner, TwoBodyCombiner,
     ThOrCombiner__2ChargedBasics, ThOrCombiner__2Particle,
-    ThOrCombinerSSE__2ChargedBasics, ThOrCombinerScalar__2ChargedBasics,
-    ThOrCombiner__3ChargedBasics, ThOrCombiner__3Particle,
-    ThOrCombinerSSE__3ChargedBasics, ThOrCombinerScalar__3ChargedBasics,
+    ThOrCombinerScalar__2ChargedBasics, ThOrCombiner__3ChargedBasics,
+    ThOrCombiner__3Particle, ThOrCombinerScalar__3ChargedBasics,
     MakeZip__ChargedBasics_as_Particles)
 
 from Hlt2Conf.standard_particles import (
@@ -515,7 +514,7 @@ def make_twobody(
     assert combiner in {
         'LoKiCombineParticles', 'ThOrCombiner', 'ThOrLHCbParticle'
     }
-    assert alg_backend in {'Best', 'SSE', 'Scalar', 'Particle'}
+    assert alg_backend in {'Best', 'Scalar', 'Particle'}
 
     def loki_thor(loki, thor):
         return loki.format(
@@ -557,7 +556,6 @@ def make_twobody(
         assert len(particles) == 2
         alg = {
             'Best': ThOrCombiner__2ChargedBasics,
-            'SSE': ThOrCombinerSSE__2ChargedBasics,
             'Scalar': ThOrCombinerScalar__2ChargedBasics,
             'Particle': ThOrCombiner__2Particle,
         }[alg_backend]
@@ -634,7 +632,7 @@ def make_threebody(
     assert combiner in {
         'LoKiCombineParticles', 'LoKi3Body', 'ThOrCombiner', 'ThOrLHCbParticle'
     }
-    assert alg_backend in {'Best', 'SSE', 'Scalar', 'Particle'}
+    assert alg_backend in {'Best', 'Scalar', 'Particle'}
 
     def loki_thor(loki, thor):
         return loki.format(
@@ -703,7 +701,6 @@ def make_threebody(
         assert len(particles) == 3
         alg = {
             'Best': ThOrCombiner__3ChargedBasics,
-            'SSE': ThOrCombinerSSE__3ChargedBasics,
             'Scalar': ThOrCombinerScalar__3ChargedBasics,
             'Particle': ThOrCombiner__3Particle,
         }[alg_backend]

Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm_thor/builders/d_builder.py

@@ -22,7 +22,6 @@ from PyConf import configurable
 from . import basic_builder
 
 from PyConf.Algorithms import (TwoBodyCombiner, ThOrCombiner__2Particle,
-                               ThOrCombinerSSE__CompositesChargedBasics,
                                ThOrCombinerScalar__CompositesChargedBasics,
                                ThOrCombiner__CompositesChargedBasics)
 
@@ -80,7 +79,6 @@ def make_excitedd_to_dneutral(
         alg = {
             'Best': ThOrCombiner__CompositesChargedBasics,
             # TODO: switch to 2 Composite + Neutral
-            'SSE': ThOrCombinerSSE__CompositesChargedBasics,
             'Scalar': ThOrCombinerScalar__CompositesChargedBasics,
             'Particle': ThOrCombiner__2Particle,
         }[alg_backend]