Merge ModelLoader and InferenceRunner into same class. by robertwb · Pull Request #21795 · apache/beam

robertwb · 2022-06-10T17:30:38Z

Thank you for your contribution! Follow this checklist to help us incorporate your contribution quickly and easily:

Choose reviewer(s) and mention them in a comment (R: @username).
Mention the appropriate issue in your description (for example: "addresses [BEAM-121] Add DisplayData for IO transforms #123), if applicable. This will automatically add a link to the pull request in the issue. If you would like the issue to automatically close on merging the pull request, comment "fixes #" instead.
Update CHANGES.md with noteworthy changes.
If this contribution is large, please file an Apache Individual Contributor License Agreement.

See the Contributor Guide for more tips on how to make review process smoother.

To check the build health, please visit https://github.com/apache/beam/blob/master/.test-infra/BUILD_STATUS.md

GitHub Actions Tests Status (on master branch)

See CI.md for more information about GitHub Actions CI.

robertwb · 2022-06-10T17:31:05Z

R: @yeandy , @ryanthompson591 or @TheNeuralBit

TheNeuralBit · 2022-06-10T17:37:45Z

sdks/python/apache_beam/ml/inference/base.py

-class InferenceRunner(Generic[ExampleT, PredictionT, ModelT]):
-  """Implements running inferences for a framework."""
+class ModelHandler(Generic[ExampleT, PredictionT, ModelT]):
+  """Has the ability to load an ML model."""


Maybe update this docstring?

Similarly for the implementations, consider if the the docstrings need to be merged.

ryanthompson591 · 2022-06-10T17:38:46Z

sdks/python/apache_beam/ml/inference/base.py

-class InferenceRunner(Generic[ExampleT, PredictionT, ModelT]):
-  """Implements running inferences for a framework."""
+class ModelHandler(Generic[ExampleT, PredictionT, ModelT]):
+  """Has the ability to load an ML model."""


Has the abiltity to load ML models and run inferences on that model.

ryanthompson591 · 2022-06-10T17:43:03Z

sdks/python/apache_beam/ml/inference/sklearn_inference.py

@@ -26,8 +26,7 @@



Might have to merge this file since I just merged a change. Should be straight forward.

ryanthompson591 · 2022-06-10T17:44:01Z

sdks/python/apache_beam/ml/inference/sklearn_inference_test.py

  def test_predict_output(self):
    fake_model = FakeModel()
-    inference_runner = SklearnInferenceRunner()
+    inference_runner = SklearnModelHandler('unused')


SklearnModelHandler(uri='unused')?

yeandy

I can't add a Github comment since these lines weren't changed, but can we change the name test_inference_runner_X to something like test_model_handler_X in the pytorch_inference.py file? Lines 142, 169, 182, 218

sdks/python/apache_beam/ml/inference/sklearn_inference.py

Co-authored-by: Andy Ye <andyye333@gmail.com>

codecov · 2022-06-10T18:08:37Z

Codecov Report

Merging #21795 (3eaccaf) into master (913c81e) will increase coverage by 0.03%.
The diff coverage is 51.42%.

❗ Current head 3eaccaf differs from pull request most recent head 758bc7a. Consider uploading reports for the commit 758bc7a to get more accurate results

@@            Coverage Diff             @@
##           master   #21795      +/-   ##
==========================================
+ Coverage   74.01%   74.05%   +0.03%     
==========================================
  Files         698      698              
  Lines       92224    92330     +106     
==========================================
+ Hits        68263    68377     +114     
+ Misses      22710    22702       -8     
  Partials     1251     1251

Flag	Coverage Δ
python	`83.64% <51.42%> (+0.03%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
...thon/apache_beam/ml/inference/pytorch_inference.py	`0.00% <0.00%> (ø)`
sdks/python/apache_beam/ml/inference/base.py	`94.30% <88.88%> (+0.60%)`	⬆️
sdks/python/apache_beam/ml/inference/api.py	`90.00% <100.00%> (ø)`
...thon/apache_beam/ml/inference/sklearn_inference.py	`91.66% <100.00%> (-0.84%)`	⬇️
...eam/transforms/py_dataflow_distribution_counter.py	`91.42% <0.00%> (-4.87%)`	⬇️
sdks/python/apache_beam/utils/counters.py	`85.39% <0.00%> (-1.36%)`	⬇️
...eam/runners/portability/fn_api_runner/execution.py	`92.44% <0.00%> (-0.65%)`	⬇️
...hon/apache_beam/runners/worker/bundle_processor.py	`93.42% <0.00%> (-0.25%)`	⬇️
...ks/python/apache_beam/runners/worker/sdk_worker.py	`88.94% <0.00%> (-0.16%)`	⬇️
sdks/python/apache_beam/transforms/window.py	`87.20% <0.00%> (+0.15%)`	⬆️
... and 10 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 913c81e...758bc7a. Read the comment docs.

…-merge

robertwb · 2022-06-10T18:16:27Z

Run PythonLint PreCommit

Abacn · 2022-06-10T19:28:44Z

Seems Unit tests are brocken:

self = <apache_beam.ml.inference.sklearn_inference_test.SkLearnRunInferenceTest testMethod=test_infer_invalid_data_type>
    def test_infer_invalid_data_type(self):
      with self.assertRaises(ValueError):
        unexpected_input_type = [[1, 2, 3, 4], [5, 6, 7, 8]]
>       inference_runner = SklearnModelLoader(model_uri=unused)
E       NameError: name 'SklearnModelLoader' is not defined

Merge ModelLoader and InferenceRunner into same class.

3eaccaf

github-actions bot added the python label Jun 10, 2022

TheNeuralBit approved these changes Jun 10, 2022

View reviewed changes

ryanthompson591 approved these changes Jun 10, 2022

View reviewed changes

yeandy approved these changes Jun 10, 2022

View reviewed changes

sdks/python/apache_beam/ml/inference/sklearn_inference.py Outdated Show resolved Hide resolved

robertwb and others added 4 commits June 10, 2022 10:57

Update sdks/python/apache_beam/ml/inference/sklearn_inference.py

963117b

Co-authored-by: Andy Ye <andyye333@gmail.com>

review comments

1411ec1

merge

0987389

Merge branch 'master' into ml-merge

200682f

robertwb added 3 commits June 10, 2022 11:09

post-merge fixes

4a1bac1

Merge branch 'ml-merge' of github.com:robertwb/incubator-beam into ml…

5d60e63

…-merge

yapf

758bc7a

robertwb merged commit 997623d into apache:master Jun 10, 2022

bullet03 pushed a commit to akvelon/beam that referenced this pull request Jun 20, 2022

Merge ModelLoader and InferenceRunner into same class. (apache#21795)

4d617dd

Conversation

robertwb commented Jun 10, 2022

GitHub Actions Tests Status (on master branch)

Uh oh!

robertwb commented Jun 10, 2022

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

yeandy left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

codecov bot commented Jun 10, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

robertwb commented Jun 10, 2022

Uh oh!

Abacn commented Jun 10, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

yeandy left a comment •

edited

Loading

codecov bot commented Jun 10, 2022 •

edited

Loading