Move ResourceInformation abstract base class to FWCore/AbstractServices, and few additional improvements
#47280
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
cms-bot internal usage |
|
-code-checks Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-47280/43591
Code check has found code style and quality issues which could be resolved by applying following patch(s)
|
makortel
force-pushed
the
moveResourceInformation
branch
from
0f48c12 to
d5d136b
Compare
|
+code-checks Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-47280/43593
|
|
A new Pull Request was created by @makortel for master. It involves the following packages:
The following packages do not have a category, yet: FWCore/AbstractServices @Dr15Jones, @cmsbuild, @fwyzard, @makortel, @smuzaffar, @valsdav, @y19y19 can you please review it and eventually sign? Thanks. cms-bot commands are listed here |
|
enable gpu |
|
@cmsbuild, please test |
|
-1 Failed Tests: Build BuildI found compilation error when building: >> Compiling src/HeterogeneousCore/ROCmServices/test/testROCmService.cpp
/cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02875/el8_amd64_gcc12/external/gcc/12.3.1-40d504be6370b5a30e3947a6e575ca28/bin/c++ -c -DCMS_MICRO_ARCH='x86-64-v3' -DGNU_GCC -D_GNU_SOURCE -DTBB_USE_GLIBCXX_VERSION=120301 -DTBB_SUPPRESS_DEPRECATED_MESSAGES -DTBB_PREVIEW_RESUMABLE_TASKS=1 -DTBB_PREVIEW_TASK_GROUP_EXTENSIONS=1 -D__HIP_PLATFORM_HCC__ -D__HIP_PLATFORM_AMD__ -DBOOST_SPIRIT_THREADSAFE -DPHOENIX_THREADSAFE -DBOOST_MATH_DISABLE_STD_FPCLASSIFY -DBOOST_UUID_RANDOM_PROVIDER_FORCE_POSIX -DCMSSW_GIT_HASH='CMSSW_15_0_X_2025-02-05-2300' -DPROJECT_NAME='CMSSW' -DPROJECT_VERSION='CMSSW_15_0_X_2025-02-05-2300' -Isrc -Ipoison -I/cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02875/el8_amd64_gcc12/cms/cmssw-patch/CMSSW_15_0_X_2025-02-05-2300/src -I/cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02875/el8_amd64_gcc12/external/pcre/8.43-2d141998cfe5424b8f7aff48035cc2da/include -isystem/cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02875/el8_amd64_gcc12/external/boost/1.80.0-a2c84315bd72151dcb3b6e3fe5018437/include -I/cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02875/el8_amd64_gcc12/external/bz2lib/1.0.6-d065ccd79984efc6d4660f410e4c81de/include -I/cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02875/el8_amd64_gcc12/external/libuuid/2.34-27ce4c3579b5b1de2808ea9c4cd8ed29/include -I/cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02875/el8_amd64_gcc12/external/python3/3.9.14-ccc34bac15aa449b4c76ba24d02d2fd7/include/python3.9 -isystem/cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02875/el8_amd64_gcc12/external/rocm/6.2.4-0a366585c16e3116ddeaba7741c05c93/include -isystem/cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02875/el8_amd64_gcc12/lcg/root/6.32.09-47cefdd6f737afcf5535fa577c928c47/include -isystem/cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02875/el8_amd64_gcc12/external/tbb/v2021.9.0-63e1493f6c63f7899f38cf6d13a1d19f/include -I/cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02875/el8_amd64_gcc12/external/xz/5.2.5-6f3f49b07db84e10c9be594a1176c114/include -I/cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02875/el8_amd64_gcc12/external/zlib/1.2.13-d217cdbdd8d586e845e05946de2796be/include -I/cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02875/el8_amd64_gcc12/external/catch2/2.13.6-17102db92de47c6a473c6e67627c548a/include -I/cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02875/el8_amd64_gcc12/external/fmt/10.2.1-e35fd1db5eb3abc8ac0452e8ee427196/include -I/cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02875/el8_amd64_gcc12/external/md5/1.0.0-5b594b264e04ae51e893b1d69a797ec6/include -I/cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02875/el8_amd64_gcc12/external/py3-pybind11/2.13.6-16793d3657f4e0749f8f9007c2eabf31/lib/python3.9/site-packages/pybind11/include -I/cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02875/el8_amd64_gcc12/external/tinyxml2/6.2.0-f99ae2781d074227d47e8a3e7c8ec87e/include -O3 -pthread -pipe -Werror=main -Werror=pointer-arith -Werror=overlength-strings -Wno-vla -Werror=overflow -std=c++20 -ftree-vectorize -Werror=array-bounds -Werror=format-contains-nul -Werror=type-limits -fvisibility-inlines-hidden -fno-math-errno --param vect-max-version-for-alias-checks=50 -Xassembler --compress-debug-sections -Wno-error=array-bounds -Warray-bounds -fuse-ld=bfd -march=x86-64-v3 -felide-constructors -fmessage-length=0 -Wall -Wno-non-template-friend -Wno-long-long -Wreturn-type -Wextra -Wpessimizing-move -Wclass-memaccess -Wno-cast-function-type -Wno-unused-but-set-parameter -Wno-ignored-qualifiers -Wno-unused-parameter -Wunused -Wparentheses -Werror=return-type -Werror=missing-braces -Werror=unused-value -Werror=unused-label -Werror=address -Werror=format -Werror=sign-compare -Werror=write-strings -Werror=delete-non-virtual-dtor -Werror=strict-aliasing -Werror=narrowing -Werror=unused-but-set-variable -Werror=reorder -Werror=unused-variable -Werror=conversion-null -Werror=return-local-addr -Wnon-virtual-dtor -Werror=switch -fdiagnostics-show-option -Wno-unused-local-typedefs -Wno-attributes -Wno-psabi -Wno-error=unused-variable -DBOOST_DISABLE_ASSERTS -flto=auto -fipa-icf -flto-odr-type-merging -fno-fat-lto-objects -Wodr -fPIC -MMD -MF tmp/el8_amd64_gcc12/src/HeterogeneousCore/ROCmServices/test/testROCmService/testROCmService.cpp.d src/HeterogeneousCore/ROCmServices/test/testROCmService.cpp -o tmp/el8_amd64_gcc12/src/HeterogeneousCore/ROCmServices/test/testROCmService/testROCmService.cpp.o
>> Compiling src/HeterogeneousCore/ROCmServices/test/test_main.cpp
/cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02875/el8_amd64_gcc12/external/gcc/12.3.1-40d504be6370b5a30e3947a6e575ca28/bin/c++ -c -DCMS_MICRO_ARCH='x86-64-v3' -DGNU_GCC -D_GNU_SOURCE -DTBB_USE_GLIBCXX_VERSION=120301 -DTBB_SUPPRESS_DEPRECATED_MESSAGES -DTBB_PREVIEW_RESUMABLE_TASKS=1 -DTBB_PREVIEW_TASK_GROUP_EXTENSIONS=1 -D__HIP_PLATFORM_HCC__ -D__HIP_PLATFORM_AMD__ -DBOOST_SPIRIT_THREADSAFE -DPHOENIX_THREADSAFE -DBOOST_MATH_DISABLE_STD_FPCLASSIFY -DBOOST_UUID_RANDOM_PROVIDER_FORCE_POSIX -DCMSSW_GIT_HASH='CMSSW_15_0_X_2025-02-05-2300' -DPROJECT_NAME='CMSSW' -DPROJECT_VERSION='CMSSW_15_0_X_2025-02-05-2300' -Isrc -Ipoison -I/cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02875/el8_amd64_gcc12/cms/cmssw-patch/CMSSW_15_0_X_2025-02-05-2300/src -I/cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02875/el8_amd64_gcc12/external/pcre/8.43-2d141998cfe5424b8f7aff48035cc2da/include -isystem/cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02875/el8_amd64_gcc12/external/boost/1.80.0-a2c84315bd72151dcb3b6e3fe5018437/include -I/cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02875/el8_amd64_gcc12/external/bz2lib/1.0.6-d065ccd79984efc6d4660f410e4c81de/include -I/cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02875/el8_amd64_gcc12/external/libuuid/2.34-27ce4c3579b5b1de2808ea9c4cd8ed29/include -I/cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02875/el8_amd64_gcc12/external/python3/3.9.14-ccc34bac15aa449b4c76ba24d02d2fd7/include/python3.9 -isystem/cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02875/el8_amd64_gcc12/external/rocm/6.2.4-0a366585c16e3116ddeaba7741c05c93/include -isystem/cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02875/el8_amd64_gcc12/lcg/root/6.32.09-47cefdd6f737afcf5535fa577c928c47/include -isystem/cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02875/el8_amd64_gcc12/external/tbb/v2021.9.0-63e1493f6c63f7899f38cf6d13a1d19f/include -I/cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02875/el8_amd64_gcc12/external/xz/5.2.5-6f3f49b07db84e10c9be594a1176c114/include -I/cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02875/el8_amd64_gcc12/external/zlib/1.2.13-d217cdbdd8d586e845e05946de2796be/include -I/cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02875/el8_amd64_gcc12/external/catch2/2.13.6-17102db92de47c6a473c6e67627c548a/include -I/cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02875/el8_amd64_gcc12/external/fmt/10.2.1-e35fd1db5eb3abc8ac0452e8ee427196/include -I/cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02875/el8_amd64_gcc12/external/md5/1.0.0-5b594b264e04ae51e893b1d69a797ec6/include -I/cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02875/el8_amd64_gcc12/external/py3-pybind11/2.13.6-16793d3657f4e0749f8f9007c2eabf31/lib/python3.9/site-packages/pybind11/include -I/cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02875/el8_amd64_gcc12/external/tinyxml2/6.2.0-f99ae2781d074227d47e8a3e7c8ec87e/include -O3 -pthread -pipe -Werror=main -Werror=pointer-arith -Werror=overlength-strings -Wno-vla -Werror=overflow -std=c++20 -ftree-vectorize -Werror=array-bounds -Werror=format-contains-nul -Werror=type-limits -fvisibility-inlines-hidden -fno-math-errno --param vect-max-version-for-alias-checks=50 -Xassembler --compress-debug-sections -Wno-error=array-bounds -Warray-bounds -fuse-ld=bfd -march=x86-64-v3 -felide-constructors -fmessage-length=0 -Wall -Wno-non-template-friend -Wno-long-long -Wreturn-type -Wextra -Wpessimizing-move -Wclass-memaccess -Wno-cast-function-type -Wno-unused-but-set-parameter -Wno-ignored-qualifiers -Wno-unused-parameter -Wunused -Wparentheses -Werror=return-type -Werror=missing-braces -Werror=unused-value -Werror=unused-label -Werror=address -Werror=format -Werror=sign-compare -Werror=write-strings -Werror=delete-non-virtual-dtor -Werror=strict-aliasing -Werror=narrowing -Werror=unused-but-set-variable -Werror=reorder -Werror=unused-variable -Werror=conversion-null -Werror=return-local-addr -Wnon-virtual-dtor -Werror=switch -fdiagnostics-show-option -Wno-unused-local-typedefs -Wno-attributes -Wno-psabi -Wno-error=unused-variable -DBOOST_DISABLE_ASSERTS -flto=auto -fipa-icf -flto-odr-type-merging -fno-fat-lto-objects -Wodr -fPIC -MMD -MF tmp/el8_amd64_gcc12/src/HeterogeneousCore/ROCmServices/test/testROCmService/test_main.cpp.d src/HeterogeneousCore/ROCmServices/test/test_main.cpp -o tmp/el8_amd64_gcc12/src/HeterogeneousCore/ROCmServices/test/testROCmService/test_main.cpp.o
In file included from src/HeterogeneousCore/ROCmServices/test/testROCmService.cpp:20:
poison/FWCore/Utilities/interface/ResourceInformation.h:1:2: error: #error THIS FILE HAS BEEN REMOVED FROM THE PACKAGE.
1 | #error THIS FILE HAS BEEN REMOVED FROM THE PACKAGE.
| ^~~~~
src/HeterogeneousCore/ROCmServices/test/testROCmService.cpp: In function 'void ____C_A_T_C_H____T_E_S_T____0()':
src/HeterogeneousCore/ROCmServices/test/testROCmService.cpp:134:25: error: 'ResourceInformation' is not a member of 'edm'
134 | edm::Service ri;
|
|
Pull request #47280 was updated. @Dr15Jones, @cmsbuild, @fwyzard, @makortel, @smuzaffar, @valsdav, @y19y19 can you please check and sign again. |
|
+1 Size: This PR adds an extra 24KB to repository Comparison SummarySummary:
GPU Comparison SummarySummary:
|
|
CPU differences are related to #47071. GPU differences seem compatible with the non-reproducibilities in the pixel code. |
|
+core |
|
+heterogeneous |
|
@cms-sw/ml-l2 Could you review and sign, please? Thanks! |
|
+ml |
cmsbuild
added
fully-signed
ml-approved
and removed
pending-signatures
ml-pending
labels
|
This pull request is fully signed and it will be integrated in one of the next master IBs (tests are also fine). This pull request will now be reviewed by the release team before it's merged. @rappoccio, @mandrenguyen, @antoniovilela, @sextonkennedy (and backports should be raised in the release meeting by the corresponding L2) |
|
+1 |
This was referenced Feb 11, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR description:
This PR is part of #30044.
It primarily moves the
ResourceInformationabstract base class to a newFWCore/AbstractServicespackage, in order to (in a subsequent PR) to have theResourceInformationto returnHardwareResourcesDescriptionobject (added in #47175, located inDataFormats/Provenance). We can't makeFWCore/Utilitiesto depend onDataFormats/Provenance, and moving a service base class toDataFormats/Provenancedidn't feel good either. We will later move other abstract base classes fromFWCore/UtilitiestoFWCore/AbstractServices.In addition, to prepare for
HardwareResourcesDescription, this PR replaces theenumfor "available accelerator types" as string(s) for "selected accelerators", that is just what comes fromprocess.options.accelerators.In addition (mostly to just take advantage of the PR touching these packages), this PR adds
hasGpuNvidia()member function toResourceInformationthat can be used (e.g. inTensorFloworPyTorchpackages) to check if the job should use NVIDIA GPUs in a way that does not directly depend on CUDA. The last commit then changes the code inTensorFlowto use this function.Resolves cms-sw/framework-team#1198
Resolves cms-sw/framework-team#1200
PR validation:
Code compiles
If this PR is a backport please specify the original PR and why you need to backport that PR. If this PR will be backported please specify to which release cycle the backport is meant for:
To be eventually backported to 15_0_X.