Comments

.github/workflows/post_pr_merge.yml

@@ -16,6 +16,9 @@ on:
       - develop
     types:
       - closed
+    paths-ignore:
+      - '**/*.md'
+      - 'docs/**/*'
 
 jobs:
   upload-coverage-common:

.github/workflows/precommit.yml

@@ -95,50 +95,6 @@ jobs:
           token: ${{ secrets.CODECOV_TOKEN }}
           name: coverage_openvino
           flags: OPENVINO
-  torchFX:
-    timeout-minutes: 40
-    defaults:
-      run:
-        shell: bash
-    runs-on: ubuntu-20.04-8-cores
-    env:
-      DEBIAN_FRONTEND: noninteractive
-    steps:
-      - name: Install dependencies
-        run : |
-          sudo apt-get update
-          sudo apt-get --assume-yes install gcc g++ build-essential ninja-build libgl1-mesa-dev libglib2.0-0
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
-        with:
-          lfs: true
-      - uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
-        with:
-          python-version: 3.8.18
-          cache: pip
-      - name: Runner info
-        continue-on-error: true
-        run: |
-          cat /etc/*release
-          cat /proc/cpuinfo
-      - name: Install NNCF and test requirements
-        run: make install-torch-fx-test
-      - name: Run TorchFX precommit test scope
-        run: |
-          make test-torch-fx
-        env:
-          NNCF_COVERAGE: 1
-          NUM_WORKERS: 4
-      - name: Upload coverage report as artifact
-        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
-        with:
-          name: coverage_fx_cpu
-          path: ./coverage.xml
-      - name: Upload coverage report to codecov
-        uses: codecov/codecov-action@125fc84a9a348dbcf27191600683ec096ec9021c # v4.4.1
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          name: coverage_fx_cpu
-          flags: TORCH
   pytorch-cpu:
     timeout-minutes: 40
     defaults:

Makefile

@@ -153,6 +153,7 @@ test-torch-cuda:
 
 test-torch-nightly:
 	pytest ${COVERAGE_ARGS} tests/torch -m nightly --junitxml ${JUNITXML_PATH} $(DATA_ARG)
+	test-torch-fx
 
 test-torch-weekly:
 	pytest ${COVERAGE_ARGS} tests/torch -m weekly \

nncf/common/factory.py

@@ -43,7 +43,7 @@ def create(model: TModel) -> NNCFGraph:
 
             return GraphConverter.create_nncf_graph(model)
         if model_backend == BackendType.TORCH_FX:
-            from nncf.experimental.torch_fx.nncf_graph_builder import GraphConverter
+            from nncf.experimental.torch.fx.nncf_graph_builder import GraphConverter
 
             return GraphConverter.create_nncf_graph(model)
         if model_backend == BackendType.TORCH:
@@ -77,7 +77,7 @@ def create(model: TModel, inplace: bool = False) -> ModelTransformer:
 
             return PTModelTransformer(model)
         if model_backend == BackendType.TORCH_FX:
-            from nncf.experimental.torch_fx.model_transformer import FXModelTransformer
+            from nncf.experimental.torch.fx.model_transformer import FXModelTransformer
 
             return FXModelTransformer(model)
         raise nncf.UnsupportedBackendError(
@@ -108,7 +108,7 @@ def create(model: TModel) -> Engine:
 
             return PTEngine(model)
         if model_backend == BackendType.TORCH_FX:
-            from nncf.experimental.torch_fx.engine import FXEngine
+            from nncf.experimental.torch.fx.engine import FXEngine
 
             return FXEngine(model)
         raise nncf.UnsupportedBackendError(
@@ -164,7 +164,7 @@ def create(model: TModel, dataset: Dataset) -> aggregator.StatisticsAggregator:
 
             return PTStatisticsAggregator(dataset)
         if model_backend == BackendType.TORCH_FX:
-            from nncf.experimental.torch_fx.statistics.aggregator import FXStatisticsAggregator
+            from nncf.experimental.torch.fx.statistics.aggregator import FXStatisticsAggregator
 
             return FXStatisticsAggregator(dataset)
         raise nncf.UnsupportedBackendError(