Added package_dir for loadgen, added pypi loadgen test in github action

mlcommons · Oct 23, 2024 · decce8c · decce8c
1 parent 8ca64f9
commit decce8c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/test-resnet50.yml b/.github/workflows/test-resnet50.yml
@@ -22,6 +22,7 @@ jobs:
       matrix:
         python-version: [ "3.9" ]
         backend: [ "onnxruntime", "tf" ]
+        loadgen-flag: [ "", "--adr.loadgen.tags=_from-pip --pip_loadgen=yes" ]
 
     steps:
     - uses: actions/checkout@v3
@@ -34,4 +35,4 @@ jobs:
         python3 -m pip install cm4mlops
     - name: Test Resnet50 and end to end submission generation
       run: |
-        cm run script --tags=run,mlperf,inference,generate-run-cmds,_submission,_short --quiet --submitter="MLCommons" --hw_name=default --model=resnet50 --implementation=reference --backend=${{ matrix.backend }} --device=cpu --scenario=Offline --test_query_count=500 --adr.compiler.tags=gcc --adr.inference-src.tags=_branch.${{ github.event.pull_request.head.ref }},_repo.${{ github.event.pull_request.head.repo.html_url }} --adr.inference-src.version=custom --adr.loadgen.version=custom
+        cm run script --tags=run,mlperf,inference,generate-run-cmds,_submission,_short --quiet --submitter="MLCommons" --hw_name=default --model=resnet50 --implementation=reference --backend=${{ matrix.backend }} --device=cpu --scenario=Offline --test_query_count=500 --adr.compiler.tags=gcc --adr.inference-src.tags=_branch.${{ github.event.pull_request.head.ref }},_repo.${{ github.event.pull_request.head.repo.html_url }} --adr.inference-src.version=custom --adr.loadgen.version=custom ${{ matrix.loadgen-flag }}
diff --git a/loadgen/CMakeLists.txt b/loadgen/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.12)
 
 project(mlperf_loadgen)
 

diff --git a/loadgen/setup.py b/loadgen/setup.py
@@ -127,7 +127,8 @@
       url="https://mlcommons.org/",
       cmdclass={"build_ext": build_ext},
       ext_modules=[mlperf_loadgen_module],
-      package_dir={'': 'mlcommons_loadgen'},
+      packages=['mlperf_loadgen'],
+      package_dir={'mlperf_loadgen': '.'},
       include_package_data=True,
       long_description=mlperf_long_description,
       long_description_content_type='text/markdown')