optimum-rbln 0.9.2a9__tar.gz → 0.9.2rc0__tar.gz

optimum_rbln-0.9.2rc0/.github/scripts/test_cli.py

@@ -0,0 +1,245 @@
+#!/usr/bin/env python3
+# Copyright 2025 Rebellions Inc. All rights reserved.
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+
+#     http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import argparse
+import shutil
+import subprocess
+import sys
+from pathlib import Path
+
+
+def run_command(cmd):
+    """Run command and return success status."""
+    print(f"Running: {' '.join(cmd)}")
+    result = subprocess.run(cmd, capture_output=True, text=True)
+    if result.returncode != 0:
+        print(f"❌ Command failed with exit code {result.returncode}")
+        print(f"STDOUT: {result.stdout}")
+        print(f"STDERR: {result.stderr}")
+        return False
+    print("✅ Command succeeded")
+    return True
+
+
+def test_cli_help():
+    """Test CLI help command."""
+    print("\n🔍 Testing CLI help command...")
+    return run_command(["uv", "run", "python", "-m", "optimum.rbln.cli", "--help"])
+
+
+def test_resnet_compilation():
+    """Test ResNet model compilation."""
+    print("\n🔍 Testing ResNet model compilation...")
+
+    test_output_dir = "/tmp/test_cli_resnet"
+
+    # Clean up if exists
+    if Path(test_output_dir).exists():
+        shutil.rmtree(test_output_dir)
+
+    # Run CLI compilation
+    cmd = [
+        "uv",
+        "run",
+        "python",
+        "-m",
+        "optimum.rbln.cli",
+        "--output-dir",
+        test_output_dir,
+        "--model-id",
+        "hf-internal-testing/tiny-random-ResNetForImageClassification",
+    ]
+
+    if not run_command(cmd):
+        return False
+
+    # Check if required files are generated
+    output_path = Path(test_output_dir)
+
+    required_files = ["rbln_config.json", "compiled_model.rbln"]
+    for file_name in required_files:
+        file_path = output_path / file_name
+        if not file_path.exists():
+            print(f"❌ Required file not found: {file_path}")
+            return False
+        print(f"✅ Found required file: {file_path}")
+
+    # Clean up
+    shutil.rmtree(test_output_dir)
+    print("✅ ResNet compilation test passed")
+    return True
+
+
+def test_stable_diffusion_compilation():
+    """Test Stable Diffusion model compilation."""
+    print("\n🔍 Testing Stable Diffusion model compilation...")
+
+    test_output_dir = "/tmp/test_cli_stable_diffusion"
+
+    # Clean up if exists
+    if Path(test_output_dir).exists():
+        shutil.rmtree(test_output_dir)
+
+    # Run CLI compilation with diffusion-specific config
+    cmd = [
+        "uv",
+        "run",
+        "python",
+        "-m",
+        "optimum.rbln.cli",
+        "--output-dir",
+        test_output_dir,
+        "--model-id",
+        "hf-internal-testing/tiny-sd-pipe",
+        "--vae.sample_size",
+        "64,64",  # Fix incorrect tiny-sd-pipe's vae config.json sample_size
+        "--unet.batch_size",
+        "2",
+    ]
+
+    if not run_command(cmd):
+        return False
+
+    # Check if submodel directories and files are generated
+    output_path = Path(test_output_dir)
+
+    submodels = ["vae", "text_encoder", "unet"]
+    for submodel in submodels:
+        submodel_path = output_path / submodel
+        if not submodel_path.exists():
+            print(f"❌ Submodel directory not found: {submodel_path}")
+            return False
+        print(f"✅ Found submodel directory: {submodel_path}")
+
+        # Check for rbln_config.json in each submodel
+        config_file = submodel_path / "rbln_config.json"
+        if not config_file.exists():
+            print(f"❌ rbln_config.json not found in: {submodel_path}")
+            return False
+        print(f"✅ Found rbln_config.json in: {submodel_path}")
+
+        # Check for .rbln files in each submodel
+        rbln_files = list(submodel_path.glob("*.rbln"))
+        if not rbln_files:
+            print(f"❌ No .rbln files found in: {submodel_path}")
+            return False
+        print(f"✅ Found .rbln files in {submodel_path}: {[f.name for f in rbln_files]}")
+
+    # Clean up
+    shutil.rmtree(test_output_dir)
+    print("✅ Stable Diffusion compilation test passed")
+    return True
+
+
+def test_argument_parsing():
+    """Test CLI argument parsing and error handling."""
+    print("\n🔍 Testing CLI argument parsing...")
+
+    # Test missing required arguments
+    print("Testing missing required arguments...")
+    result = subprocess.run(["uv", "run", "python", "-m", "optimum.rbln.cli"], capture_output=True, text=True)
+    if result.returncode == 0:
+        print("❌ Expected non-zero exit for missing arguments")
+        return False
+    print("✅ Correctly failed with missing arguments (help shown)")
+
+    # Test invalid model class
+    print("Testing invalid model class...")
+    result = subprocess.run(
+        [
+            "uv",
+            "run",
+            "python",
+            "-m",
+            "optimum.rbln.cli",
+            "--output-dir",
+            "/tmp/test",
+            "--class",
+            "InvalidClass",
+            "--model-id",
+            "test",
+        ],
+        capture_output=True,
+        text=True,
+    )
+    if result.returncode == 0:
+        print("❌ Expected error for invalid model class")
+        return False
+    print("✅ Correctly failed with invalid model class error")
+
+    print("✅ Argument parsing tests passed")
+    return True
+
+
+def test_error_handling():
+    """Test CLI error handling."""
+    print("\n🔍 Testing CLI error handling...")
+
+    # Test with non-existent model
+    print("Testing non-existent model...")
+    result = subprocess.run(
+        [
+            "uv",
+            "run",
+            "python",
+            "-m",
+            "optimum.rbln.cli",
+            "/tmp/test_error",
+            "--class",
+            "RBLNAutoModelForCausalLM",
+            "--model-id",
+            "non-existent-model",
+        ],
+        capture_output=True,
+        text=True,
+    )
+    if result.returncode == 0:
+        print("❌ Expected error for non-existent model")
+        return False
+    print("✅ Correctly failed with non-existent model error")
+
+    print("✅ Error handling tests passed")
+    return True
+
+
+def main():
+    parser = argparse.ArgumentParser(description="Test CLI functionality")
+    parser.add_argument(
+        "test_type", choices=["basic", "argument-parsing", "error-handling"], help="Type of test to run"
+    )
+
+    args = parser.parse_args()
+
+    success = True
+
+    if args.test_type == "basic":
+        success &= test_cli_help()
+        success &= test_resnet_compilation()
+        success &= test_stable_diffusion_compilation()
+    elif args.test_type == "argument-parsing":
+        success &= test_argument_parsing()
+    elif args.test_type == "error-handling":
+        success &= test_error_handling()
+
+    if success:
+        print(f"\n🎉 All {args.test_type} tests passed!")
+        sys.exit(0)
+    else:
+        print(f"\n💥 Some {args.test_type} tests failed!")
+        sys.exit(1)
+
+
+if __name__ == "__main__":
+    main()

{optimum_rbln-0.9.2a9 → optimum_rbln-0.9.2rc0}/.github/workflows/rbln_optimum_pytest.yaml

@@ -46,7 +46,7 @@ jobs:
     strategy:
       fail-fast: ${{ inputs.fail_fast }}
       matrix:
-        test_type: [config, transformers, diffusers, llm]
+        test_type: [config, transformers, diffusers, llm, cli-basic, cli-argument-parsing, cli-error-handling]
     steps:
       - name: Checkout the optimum-rbln repository
         uses: actions/checkout@v4
@@ -86,6 +86,15 @@ jobs:
                 SKIP=true
               fi
               ;;
+            cli-*)
+              if [[ "$COMMIT_MESSAGE" == *"[skip-cli]"* ]]; then
+                SKIP=true
+              fi
+              # Skip advanced CLI tests if test_level is default
+              if [[ "${{ inputs.test_level }}" == "default" && "${{ matrix.test_type }}" != "cli-basic" ]]; then
+                SKIP=true
+              fi
+              ;;
           esac
           
           echo "skip=$SKIP" >> $GITHUB_OUTPUT
@@ -112,7 +121,7 @@ jobs:
           PYPI_URL=$(echo ${{ env.REBEL_PYPI_ENDPOINT }} | sed "s/\/\//\0${{ env.REBEL_PYPI_USERNAME}}:${{ env.REBEL_PYPI_PASSWORD}}@/")
           uv pip install --extra-index-url $PYPI_URL rebel-compiler==${{ inputs.rebel_compiler_version }}
 
-      - name: Run pytest
+      - name: Run tests
         if: steps.should_skip.outputs.skip != 'true'
         env:
           OPTIMUM_RBLN_TEST_LEVEL: ${{ inputs.test_level }}
@@ -130,6 +139,22 @@ jobs:
             "llm")
               uv run --no-sync pytest tests/test_llm.py -vv --durations 0
               ;;
+            cli-*)
+              # Extract test type from matrix
+              case "${{ matrix.test_type }}" in
+                "cli-basic")
+                  CLI_TEST_TYPE="basic"
+                  ;;
+                "cli-argument-parsing")
+                  CLI_TEST_TYPE="argument-parsing"
+                  ;;
+                "cli-error-handling")
+                  CLI_TEST_TYPE="error-handling"
+                  ;;
+              esac
+              echo "Running CLI test: $CLI_TEST_TYPE"
+              uv run --no-sync .github/scripts/test_cli.py "$CLI_TEST_TYPE"
+              ;;
           esac
 
       - name: Skip message

{optimum_rbln-0.9.2a9 → optimum_rbln-0.9.2rc0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: optimum-rbln
-Version: 0.9.2a9
+Version: 0.9.2rc0
 Summary: Optimum RBLN is the interface between the HuggingFace Transformers and Diffusers libraries and RBLN accelerators. It provides a set of tools enabling easy model loading and inference on single and multiple rbln device settings for different downstream tasks.
 Project-URL: Homepage, https://rebellions.ai
 Project-URL: Documentation, https://docs.rbln.ai

{optimum_rbln-0.9.2a9 → optimum_rbln-0.9.2rc0}/pyproject.toml

@@ -43,6 +43,9 @@ Homepage = "https://rebellions.ai"
 Documentation = "https://docs.rbln.ai"
 Repository = "https://github.com/rebellions-sw/optimum-rbln"
 
+[project.scripts]
+optimum-rbln-cli = "optimum.rbln.cli:main"
+
 [dependency-groups]
 tests = [
     "pytest>=8.1.1",

{optimum_rbln-0.9.2a9 → optimum_rbln-0.9.2rc0}/src/optimum/rbln/__init__.py

@@ -74,6 +74,8 @@ _import_structure = {
         "RBLNCLIPVisionModelWithProjectionConfig",
         "RBLNColPaliForRetrieval",
         "RBLNColPaliForRetrievalConfig",
+        "RBLNColQwen2ForRetrieval",
+        "RBLNColQwen2ForRetrievalConfig",
         "RBLNDecoderOnlyModelConfig",
         "RBLNDecoderOnlyModel",
         "RBLNDecoderOnlyModelForCausalLM",
@@ -366,6 +368,8 @@ if TYPE_CHECKING:
         RBLNCLIPVisionModelWithProjectionConfig,
         RBLNColPaliForRetrieval,
         RBLNColPaliForRetrievalConfig,
+        RBLNColQwen2ForRetrieval,
+        RBLNColQwen2ForRetrievalConfig,
         RBLNDecoderOnlyModel,
         RBLNDecoderOnlyModelConfig,
         RBLNDecoderOnlyModelForCausalLM,

{optimum_rbln-0.9.2a9 → optimum_rbln-0.9.2rc0}/src/optimum/rbln/__version__.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.9.2a9'
-__version_tuple__ = version_tuple = (0, 9, 2, 'a9')
+__version__ = version = '0.9.2rc0'
+__version_tuple__ = version_tuple = (0, 9, 2, 'rc0')
 
 __commit_id__ = commit_id = None