Skip to content

Commit 3edaa1a

Browse files
committed
fix: import error resolved
1 parent 6037772 commit 3edaa1a

15 files changed

Lines changed: 83 additions & 86 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Set up Python
1616
uses: actions/setup-python@v5
1717
with:
18-
python-version: "3.9"
18+
python-version: "3.11"
1919

2020
- name: Install dependencies
2121
run: |

check-ci-locally.sh

Lines changed: 0 additions & 40 deletions
This file was deleted.

mypy.ini

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
[mypy]
22
ignore_missing_imports = True
3+
exclude = generated/
34

45
[mypy-edgeflow.parser.grammar.*]
6+
ignore_errors = True
7+
8+
[mypy-inference]
9+
ignore_errors = True
10+
11+
[mypy-generated.*]
512
ignore_errors = True

src/edgeflow/backend/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.9-slim
1+
FROM python:3.11-slim
22

33
WORKDIR /app
44

src/edgeflow/backend/api/services/parser_service.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
from __future__ import annotations
22

3-
from parser import EdgeFlowParserError, parse_edgeflow_string, validate_config
3+
from edgeflow.parser import EdgeFlowParserError, parse_edgeflow_string, validate_config
44
from typing import Any, Dict, Tuple
55

6-
from edgeflow_ast import create_program_from_dict
7-
from edgeflow_ir import create_ir_from_config
8-
from error_reporter import EdgeFlowErrorReporter
9-
from static_validator import validate_edgeflow_config_static
6+
from edgeflow.ir.edgeflow_ast import create_program_from_dict
7+
from edgeflow.ir.edgeflow_ir import create_ir_from_config
8+
from edgeflow.reporting.error_reporter import EdgeFlowErrorReporter
9+
from edgeflow.analysis.static_validator import validate_edgeflow_config_static
1010

1111

1212
class ParserService:

src/edgeflow/backend/app.py

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,29 @@
1111
import json
1212
import logging
1313
from datetime import datetime, timezone
14-
from parser import parse_ef # type: ignore
14+
from edgeflow.parser import parse_ef # type: ignore
1515
from pathlib import Path
1616
from typing import Any, Dict, List, Optional
1717

1818
# Import core CLI logic
19-
import edgeflowc # type: ignore
20-
from backend.api.services.parser_service import ParserService
21-
from code_generator import CodeGenerator
19+
import edgeflow.compiler.edgeflowc as edgeflowc # type: ignore
20+
from edgeflow.backend.api.services.parser_service import ParserService
21+
from edgeflow.compiler.code_generator import CodeGenerator
2222

2323
# Import EdgeFlow pipeline components
24-
from edgeflow_ast import create_program_from_dict
25-
from edgeflow_ir import FusionPass, IRBuilder, QuantizationPass, SchedulingPass
26-
from explainability_reporter import generate_explainability_report
27-
from fast_compile import fast_compile_config
24+
from edgeflow.ir.edgeflow_ast import create_program_from_dict
25+
from edgeflow.ir.edgeflow_ir import (
26+
FusionPass,
27+
IRBuilder,
28+
QuantizationPass,
29+
SchedulingPass,
30+
)
31+
from edgeflow.reporting.explainability_reporter import generate_explainability_report
32+
from edgeflow.optimization.fast_compile import fast_compile_config
2833
from fastapi import Depends, FastAPI, File, Form, HTTPException, Request, UploadFile
2934
from fastapi.middleware.cors import CORSMiddleware
3035
from fastapi.responses import JSONResponse
31-
from initial_check import InitialChecker, perform_initial_check
36+
from edgeflow.analysis.initial_check import InitialChecker, perform_initial_check
3237
from pydantic import BaseModel, Field, constr
3338
from edgeflow.reporting.reporter import generate_json_report # type: ignore
3439

@@ -551,7 +556,11 @@ def fast_compile(
551556

552557
return FastCompileResponse(
553558
success=True,
554-
estimated_impact=result.estimated_impact,
559+
estimated_impact=(
560+
result.performance_metrics.to_dict()
561+
if result.performance_metrics
562+
else None
563+
),
555564
validation_results={"errors": result.errors, "warnings": result.warnings},
556565
message="Fast compile completed successfully",
557566
warnings=result.warnings,

src/edgeflow/compiler/code_generator.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ def _generate_python_code(self) -> str:
270270
"import numpy as np",
271271
"import cv2",
272272
"import time",
273-
"from typing import Optional, Union, List, Tuple",
273+
"from typing import Optional, Union, List, Tuple, Dict, Any",
274274
]
275275
)
276276

@@ -388,12 +388,10 @@ def _generate_python_model_loading(self, quant_type: str) -> str:
388388
)
389389
code += " \n"
390390
code += ' print(f"Model loaded: {self.model_path}")\n'
391-
code += (
392-
" print(f\"Input shape: {self.input_details[0]['shape']}\")\n"
393-
)
394-
code += (
395-
" print(f\"Output shape: {self.output_details[0]['shape']}\")\n"
396-
)
391+
code += " if self.input_details:\n"
392+
code += " print(f\"Input shape: {self.input_details[0]['shape']}\")\n"
393+
code += " if self.output_details:\n"
394+
code += " print(f\"Output shape: {self.output_details[0]['shape']}\")\n"
397395

398396
if quant_type != "none":
399397
code += f' print(f"Quantization: {quant_type.upper()}")\n'

src/edgeflow/compiler/edgeflowc.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
from edgeflow.parser import parse_edgeflow_file as _parse_edgeflow_file
2626
except ImportError:
2727
try:
28-
from parser import parse_edgeflow_file as _parse_edgeflow_file # type: ignore
28+
from edgeflow.parser import parse_edgeflow_file as _parse_edgeflow_file # type: ignore
2929
except ImportError:
3030
_parse_edgeflow_file = None # type: ignore[assignment]
3131

src/edgeflow/deployment/deploy_to_pi.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ def deploy_to_raspberry_pi(pi_ip, model_path, pi_user="pi"):
8080
import sys
8181
sys.path.append('/home/{pi_user}/edgeflow')
8282
83-
from inference import EdgeFlowInference
83+
from inference import EdgeFlowInference # type: ignore
8484
import numpy as np
8585
8686
def test_model():

src/edgeflow/deployment/deployment_orchestrator.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ def _create_deployment_package(
284284

285285
def deploy_from_dsl(dsl_file: str) -> Dict[DeploymentTarget, DeploymentResult]:
286286
"""Deploy model to all targets specified in DSL file."""
287-
from parser import parse_ef
287+
from edgeflow.parser import parse_ef
288288

289289
config = parse_ef(dsl_file)
290290
model_path = config.get("model", "model.tflite")

0 commit comments

Comments
 (0)