Merge branch 'master' into feature/remove_output_enable

Lightning-Universe · Nov 7, 2021 · 3fcd45a · 3fcd45a
2 parents a045182 + 4a242e6
commit 3fcd45a
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 21 deletions.
diff --git a/docs/source/general/predictions.rst b/docs/source/general/predictions.rst
@@ -24,7 +24,7 @@ You can pass in a sample of data (image file path, a string of text, etc) to the
 
     # 2. Load the model from a checkpoint
     model = ImageClassifier.load_from_checkpoint(
-        "https://flash-weights.s3.amazonaws.com/0.5.2/image_classification_model.pt"
+        "https://flash-weights.s3.amazonaws.com/0.6.0/image_classification_model.pt"
     )
 
     # 3. Predict whether the image contains an ant or a bee
@@ -46,7 +46,7 @@ Predict on a csv file
 
     # 2. Load the model from a checkpoint
     model = TabularClassifier.load_from_checkpoint(
-        "https://flash-weights.s3.amazonaws.com/0.5.2/tabular_classification_model.pt"
+        "https://flash-weights.s3.amazonaws.com/0.6.0/tabular_classification_model.pt"
     )
 
     # 3. Generate predictions from a csv file! Who would survive?
@@ -74,7 +74,7 @@ reference below).
 
     # 2. Load the model from a checkpoint
     model = ImageClassifier.load_from_checkpoint(
-        "https://flash-weights.s3.amazonaws.com/0.5.2/image_classification_model.pt"
+        "https://flash-weights.s3.amazonaws.com/0.6.0/image_classification_model.pt"
     )
 
     # 3. Attach the Output

diff --git a/docs/source/quickstart.rst b/docs/source/quickstart.rst
@@ -91,7 +91,7 @@ Here's an example of inference:
     from flash.text import TextClassifier
 
     # 1. Init the finetuned task from URL
-    model = TextClassifier.load_from_checkpoint("https://flash-weights.s3.amazonaws.com/0.5.2/text_classification_model.pt")
+    model = TextClassifier.load_from_checkpoint("https://flash-weights.s3.amazonaws.com/0.6.0/text_classification_model.pt")
 
     # 2. Perform inference from list of sequences
     predictions = model.predict(

diff --git a/flash_examples/integrations/fiftyone/image_classification.py b/flash_examples/integrations/fiftyone/image_classification.py
@@ -54,7 +54,7 @@
 
 # 4 Predict from checkpoint
 model = ImageClassifier.load_from_checkpoint(
-    "https://flash-weights.s3.amazonaws.com/0.5.2/image_classification_model.pt"
+    "https://flash-weights.s3.amazonaws.com/0.6.0/image_classification_model.pt"
 )
 model.output = FiftyOneLabels(return_filepath=True)  # output FiftyOne format
 predictions = trainer.predict(model, datamodule=datamodule)

diff --git a/flash_examples/integrations/fiftyone/image_classification_fiftyone_datasets.py b/flash_examples/integrations/fiftyone/image_classification_fiftyone_datasets.py
@@ -67,7 +67,7 @@
 
 # 5 Predict from checkpoint on data with ground truth
 model = ImageClassifier.load_from_checkpoint(
-    "https://flash-weights.s3.amazonaws.com/0.5.2/image_classification_model.pt"
+    "https://flash-weights.s3.amazonaws.com/0.6.0/image_classification_model.pt"
 )
 model.output = FiftyOneLabels(return_filepath=False)  # output FiftyOne format
 datamodule = ImageClassificationData.from_fiftyone(predict_dataset=test_dataset)

diff --git a/flash_examples/serve/image_classification/inference_server.py b/flash_examples/serve/image_classification/inference_server.py
@@ -14,6 +14,6 @@
 from flash.image import ImageClassifier
 
 model = ImageClassifier.load_from_checkpoint(
-    "https://flash-weights.s3.amazonaws.com/0.5.2/image_classification_model.pt"
+    "https://flash-weights.s3.amazonaws.com/0.6.0/image_classification_model.pt"
 )
 model.serve()
diff --git a/flash_examples/serve/semantic_segmentation/inference_server.py b/flash_examples/serve/semantic_segmentation/inference_server.py
@@ -15,7 +15,7 @@
 from flash.image.segmentation.output import SegmentationLabels
 
 model = SemanticSegmentation.load_from_checkpoint(
-    "https://flash-weights.s3.amazonaws.com/0.5.2/semantic_segmentation_model.pt"
+    "https://flash-weights.s3.amazonaws.com/0.6.0/semantic_segmentation_model.pt"
 )
 model.output = SegmentationLabels(visualize=False)
 model.serve()
diff --git a/flash_examples/serve/speech_recognition/inference_server.py b/flash_examples/serve/speech_recognition/inference_server.py
@@ -14,6 +14,6 @@
 from flash.audio import SpeechRecognition
 
 model = SpeechRecognition.load_from_checkpoint(
-    "https://flash-weights.s3.amazonaws.com/0.5.2/speech_recognition_model.pt"
+    "https://flash-weights.s3.amazonaws.com/0.6.0/speech_recognition_model.pt"
 )
 model.serve()
diff --git a/flash_examples/serve/summarization/inference_server.py b/flash_examples/serve/summarization/inference_server.py
@@ -14,6 +14,6 @@
 from flash.text import SummarizationTask
 
 model = SummarizationTask.load_from_checkpoint(
-    "https://flash-weights.s3.amazonaws.com/0.5.2/summarization_model_xsum.pt"
+    "https://flash-weights.s3.amazonaws.com/0.6.0/summarization_model_xsum.pt"
 )
 model.serve()
diff --git a/flash_examples/serve/tabular_classification/inference_server.py b/flash_examples/serve/tabular_classification/inference_server.py
@@ -15,7 +15,7 @@
 from flash.tabular import TabularClassifier
 
 model = TabularClassifier.load_from_checkpoint(
-    "https://flash-weights.s3.amazonaws.com/0.5.2/tabular_classification_model.pt"
+    "https://flash-weights.s3.amazonaws.com/0.6.0/tabular_classification_model.pt"
 )
 model.output = Labels(["Did not survive", "Survived"])
 model.serve()
diff --git a/flash_examples/serve/text_classification/inference_server.py b/flash_examples/serve/text_classification/inference_server.py
@@ -13,5 +13,5 @@
 # limitations under the License.
 from flash.text import TextClassifier
 
-model = TextClassifier.load_from_checkpoint("https://flash-weights.s3.amazonaws.com/0.5.2/text_classification_model.pt")
+model = TextClassifier.load_from_checkpoint("https://flash-weights.s3.amazonaws.com/0.6.0/text_classification_model.pt")
 model.serve()
diff --git a/flash_examples/serve/translation/inference_server.py b/flash_examples/serve/translation/inference_server.py
@@ -13,5 +13,5 @@
 # limitations under the License.
 from flash.text import TranslationTask
 
-model = TranslationTask.load_from_checkpoint("https://flash-weights.s3.amazonaws.com/0.5.2/translation_model_en_ro.pt")
+model = TranslationTask.load_from_checkpoint("https://flash-weights.s3.amazonaws.com/0.6.0/translation_model_en_ro.pt")
 model.serve()
diff --git a/flash_notebooks/tabular_classification.ipynb b/flash_notebooks/tabular_classification.ipynb
@@ -222,7 +222,7 @@
    "outputs": [],
    "source": [
     "model = TabularClassifier.load_from_checkpoint(\n",
-    "    \"https://flash-weights.s3.amazonaws.com/0.5.2/tabular_classification_model.pt\")"
+    "    \"https://flash-weights.s3.amazonaws.com/0.6.0/tabular_classification_model.pt\")"
    ]
   },
   {

diff --git a/tests/core/test_model.py b/tests/core/test_model.py
@@ -250,55 +250,55 @@ def test_task_datapipeline_save(tmpdir):
     [
         pytest.param(
             ImageClassifier,
-            "0.5.2/image_classification_model.pt",
+            "0.6.0/image_classification_model.pt",
             marks=pytest.mark.skipif(
                 not _IMAGE_TESTING,
                 reason="image packages aren't installed",
             ),
         ),
         pytest.param(
             SemanticSegmentation,
-            "0.5.2/semantic_segmentation_model.pt",
+            "0.6.0/semantic_segmentation_model.pt",
             marks=pytest.mark.skipif(
                 not _IMAGE_TESTING,
                 reason="image packages aren't installed",
             ),
         ),
         pytest.param(
             SpeechRecognition,
-            "0.5.2/speech_recognition_model.pt",
+            "0.6.0/speech_recognition_model.pt",
             marks=pytest.mark.skipif(
                 not _AUDIO_TESTING,
                 reason="audio packages aren't installed",
             ),
         ),
         pytest.param(
             TabularClassifier,
-            "0.5.2/tabular_classification_model.pt",
+            "0.6.0/tabular_classification_model.pt",
             marks=pytest.mark.skipif(
                 not _TABULAR_TESTING,
                 reason="tabular packages aren't installed",
             ),
         ),
         pytest.param(
             TextClassifier,
-            "0.5.2/text_classification_model.pt",
+            "0.6.0/text_classification_model.pt",
             marks=pytest.mark.skipif(
                 not _TEXT_TESTING,
                 reason="text packages aren't installed",
             ),
         ),
         pytest.param(
             SummarizationTask,
-            "0.5.2/summarization_model_xsum.pt",
+            "0.6.0/summarization_model_xsum.pt",
             marks=pytest.mark.skipif(
                 not _TEXT_TESTING,
                 reason="text packages aren't installed",
             ),
         ),
         pytest.param(
             TranslationTask,
-            "0.5.2/translation_model_en_ro.pt",
+            "0.6.0/translation_model_en_ro.pt",
             marks=pytest.mark.skipif(
                 not _TEXT_TESTING,
                 reason="text packages aren't installed",