Skip to content

Generated cfi files can now use new module syntax #44363

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cmsbuild merged 3 commits into from
May 22, 2024
Merged

Generated cfi files can now use new module syntax #44363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8d727b6
Improvements to python configuration syntax
Dr15Jones Mar 6, 2024
32f3682
Generated cfi files now may use new module syntax
Dr15Jones Mar 10, 2024
0ce7374
Fix left over merge conflicts
Dr15Jones May 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,120 changes: 561 additions & 559 deletions FWCore/Integration/plugins/ProducerWithPSetDesc.cc
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions FWCore/Integration/test/cfi_dumpPython.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
from .testProducerWithPsetDesc_cfi import testProducerWithPsetDesc
print(testProducerWithPsetDesc.dumpPython())
8 changes: 7 additions & 1 deletion FWCore/Integration/test/run_ParameterSet.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,13 @@ LOCAL_TEST_DIR=${SCRAM_TEST_PATH}
cmsRun ${LOCAL_TEST_DIR}/runAutoGeneratedCfi_cfg.py || die "cmsRun runAutoGeneratedCfi_cfg.py" $?

# Compare the cfi file to a reference file to ensure it is correct
diff ./testProducerWithPsetDesc_cfi.py ${LOCAL_TEST_DIR}/unit_test_outputs/testProducerWithPsetDesc_cfi.py || die "comparing testProducerWithPsetDesc_cfi.py" $?
mkdir testcfi
cp ${LOCAL_TEST_DIR}/cfi_dumpPython.py testcfi
cp testProducerWithPsetDesc_cfi.py testcfi
cp ProducerWithPSetDesc.py testcfi
PYTHON3PATH=${PWD}:${PYTHON3PATH} python3 -m testcfi.cfi_dumpPython > dumpPython.log
python3 ${LOCAL_TEST_DIR}/unit_test_outputs/testProducerWithPsetDesc_cfi.py > dumpPython_ref.log
diff ./dumpPython.log dumpPython_ref.log || die "comparing testProducerWithPsetDesc_cfi.py" $?

# This time try a cfi without any of the required parameters to test that we properly insert
# required missing parameters into the ParameterSet
Expand Down
2,741 changes: 2,731 additions & 10 deletions FWCore/Integration/test/unit_test_outputs/testProducerWithPsetDesc_briefdoc.txt
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions FWCore/Integration/test/unit_test_outputs/testProducerWithPsetDesc_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,3 +373,5 @@
),
mightGet = cms.optional.untracked.vstring
)

print(testProducerWithPsetDesc.dumpPython())
Loading