diff --git a/.github/workflows/madgraph_launch_test.yml b/.github/workflows/madgraph_launch_test.yml index 948b6b381b..39e0f89f43 100644 --- a/.github/workflows/madgraph_launch_test.yml +++ b/.github/workflows/madgraph_launch_test.yml @@ -51,7 +51,7 @@ jobs: cp Template/LO/Source/.make_opts Template/LO/Source/make_opts ./tests/test_manager.py -p./PLUGIN/CUDACPP_OUTPUT/acceptance_tests/ test_simd_cpp_heft_ggh_double - simd_cpp_eemumua_float: + simd_cpp_pptt_mixed: # The type of runner that the job will run on runs-on: ubuntu-latest @@ -69,9 +69,9 @@ jobs: cd MG5aMC/mg5amcnlo/ cp input/.mg5_configuration_default.txt input/mg5_configuration.txt cp Template/LO/Source/.make_opts Template/LO/Source/make_opts - ./tests/test_manager.py -p./PLUGIN/CUDACPP_OUTPUT/acceptance_tests/ test_simd_cpp_eemumua_float + ./tests/test_manager.py -p./PLUGIN/CUDACPP_OUTPUT/acceptance_tests/ test_simd_cpp_pptt_mixed - simd_cpp_vector_size: + simd_cpp_eemumua_float: # The type of runner that the job will run on runs-on: ubuntu-latest @@ -89,9 +89,9 @@ jobs: cd MG5aMC/mg5amcnlo/ cp input/.mg5_configuration_default.txt input/mg5_configuration.txt cp Template/LO/Source/.make_opts Template/LO/Source/make_opts - ./tests/test_manager.py -p./PLUGIN/CUDACPP_OUTPUT/acceptance_tests/ test_simd_cpp_vector_size + ./tests/test_manager.py -p./PLUGIN/CUDACPP_OUTPUT/acceptance_tests/ test_simd_cpp_eemumua_float - simd_cpp_ggtt_mixed: + simd_cpp_vector_size: # The type of runner that the job will run on runs-on: ubuntu-latest @@ -109,4 +109,4 @@ jobs: cd MG5aMC/mg5amcnlo/ cp input/.mg5_configuration_default.txt input/mg5_configuration.txt cp Template/LO/Source/.make_opts Template/LO/Source/make_opts - ./tests/test_manager.py -p./PLUGIN/CUDACPP_OUTPUT/acceptance_tests/ test_simd_cpp_ggtt_mixed + ./tests/test_manager.py -p./PLUGIN/CUDACPP_OUTPUT/acceptance_tests/ test_simd_cpp_vector_size diff --git a/epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/acceptance_tests/simple_cross_check/simd_cpp_eemumua_float b/epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/acceptance_tests/simple_cross_check/simd_cpp_eemumua_float index 7fc2c5f3d2..5b63dd1bff 100644 --- a/epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/acceptance_tests/simple_cross_check/simd_cpp_eemumua_float +++ b/epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/acceptance_tests/simple_cross_check/simd_cpp_eemumua_float @@ -7,4 +7,4 @@ import model sm launch set nevents 100 set floating_type f -#check run_01 0.0239204 0.0002854 100 +#check run_01 0.0266 0.0002854 100 diff --git a/epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/acceptance_tests/simple_cross_check/simd_cpp_ggtt_mixed b/epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/acceptance_tests/simple_cross_check/simd_cpp_pptt_mixed similarity index 90% rename from epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/acceptance_tests/simple_cross_check/simd_cpp_ggtt_mixed rename to epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/acceptance_tests/simple_cross_check/simd_cpp_pptt_mixed index 47d8246bf5..8cd87df8f1 100644 --- a/epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/acceptance_tests/simple_cross_check/simd_cpp_ggtt_mixed +++ b/epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/acceptance_tests/simple_cross_check/simd_cpp_pptt_mixed @@ -2,7 +2,7 @@ import model sm set automatic_html_opening False --no_save set notification_center False --no_save - generate g g > t t~ + generate p p > t t~ output madevent_simd %s -f -nojpeg launch set nevents 100 diff --git a/epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/acceptance_tests/test_simd_madevent.py b/epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/acceptance_tests/test_simd_madevent.py index 52b19e9336..c820e9a1f9 100644 --- a/epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/acceptance_tests/test_simd_madevent.py +++ b/epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/acceptance_tests/test_simd_madevent.py @@ -167,6 +167,55 @@ def test_simd_cpp_heft_ggh_double(self): self.assertEqual(nb_event, 100) # WARNING THIS FILE IS AUTOGENERATED -> edit test_simd_madevent.template + def test_simd_cpp_pptt_mixed(self): + """e check ggtt within mixed mode""" + + if logging.getLogger('madgraph').level <= 20: + stdout=None + stderr=None + else: + devnull =open(os.devnull,'w') + stdout=devnull + stderr=devnull + + try: + shutil.rmtree('/tmp/MGPROCESS/') + except Exception as error: + pass + + cmd = """#title check ggtt within mixed mode +import model sm + set automatic_html_opening False --no_save + set notification_center False --no_save + generate p p > t t~ + output madevent_simd %s -f -nojpeg + launch + set nevents 100 + set floating_type m +#check run_01 505.5 2.749 100 + + """ %self.run_dir + + open(pjoin(self.path, 'mg5_cmd'),'w').write(cmd) + + subprocess.call([sys.executable, pjoin(MG5DIR, 'bin','mg5_aMC'), + pjoin(self.path, 'mg5_cmd')], + #cwd=self.path, + stdout=stdout, stderr=stderr) + + self.check_parton_output(cross=505.5, error=2.749, run_name='run_01', html=True) + event = '%s/Events/run_01/unweighted_events.lhe' % self.run_dir + if not os.path.exists(event): + misc.gunzip(event) + + lhefile = lhe_parser.EventFile(event) + nb_event = 0 + for event in lhe_parser.EventFile(event): + event.check() + nb_event+=1 + + self.assertEqual(nb_event, 100) +# WARNING THIS FILE IS AUTOGENERATED -> edit test_simd_madevent.template def test_simd_cpp_eemumua_float(self): """e check eemumua in single precision""" @@ -192,7 +241,7 @@ def test_simd_cpp_eemumua_float(self): launch set nevents 100 set floating_type f -#check run_01 0.0239204 0.0002854 100 +#check run_01 0.0266 0.0002854 100 """ %self.run_dir @@ -203,7 +252,7 @@ def test_simd_cpp_eemumua_float(self): #cwd=self.path, stdout=stdout, stderr=stderr) - self.check_parton_output(cross=0.0239204, error=0.0002854, run_name='run_01', html=True) + self.check_parton_output(cross=0.0266, error=0.0002854, run_name='run_01', html=True) event = '%s/Events/run_01/unweighted_events.lhe' % self.run_dir if not os.path.exists(event): misc.gunzip(event) @@ -294,53 +343,4 @@ def test_simd_cpp_vector_size(self): event.check() nb_event+=1 - self.assertEqual(nb_event, 100) -# WARNING THIS FILE IS AUTOGENERATED -> edit test_simd_madevent.template - def test_simd_cpp_ggtt_mixed(self): - """e check ggtt within mixed mode""" - - if logging.getLogger('madgraph').level <= 20: - stdout=None - stderr=None - else: - devnull =open(os.devnull,'w') - stdout=devnull - stderr=devnull - - try: - shutil.rmtree('/tmp/MGPROCESS/') - except Exception as error: - pass - - cmd = """#title check ggtt within mixed mode -import model sm - set automatic_html_opening False --no_save - set notification_center False --no_save - generate g g > t t~ - output madevent_simd %s -f -nojpeg - launch - set nevents 100 - set floating_type m -#check run_01 505.5 2.749 100 - - """ %self.run_dir - - open(pjoin(self.path, 'mg5_cmd'),'w').write(cmd) - - subprocess.call([sys.executable, pjoin(MG5DIR, 'bin','mg5_aMC'), - pjoin(self.path, 'mg5_cmd')], - #cwd=self.path, - stdout=stdout, stderr=stderr) - - self.check_parton_output(cross=505.5, error=2.749, run_name='run_01', html=True) - event = '%s/Events/run_01/unweighted_events.lhe' % self.run_dir - if not os.path.exists(event): - misc.gunzip(event) - - lhefile = lhe_parser.EventFile(event) - nb_event = 0 - for event in lhe_parser.EventFile(event): - event.check() - nb_event+=1 - self.assertEqual(nb_event, 100) \ No newline at end of file