diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 973dcee..8f4cbb2 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -47,6 +47,12 @@ jobs: run: | pip install -e .[dev] pip install coverage-badge>=1.1.0 pytest-cov>=4.1.0 + + # macOS: disable Hugging Face Xet (prevents hf_xet errors) + - name: Disable HF Xet [macOS] + if: matrix.os == 'macOS-latest' + run: echo "HF_HUB_DISABLE_XET=1" >> "$GITHUB_ENV" + - name: Run tests with coverage [Ubuntu] if: matrix.os == 'buildjet-8vcpu-ubuntu-2204' && matrix.version == '3.10' run: pytest tests/core_tests --cov=datadreamer --cov-report xml --junit-xml pytest.xml @@ -60,7 +66,7 @@ jobs: run: coverage-badge -o media/coverage_badge.svg -f - name: Generate coverage report [Ubuntu] - if: matrix.os == 'buildjet-8vcpu-ubuntu-2204' && matrix.version == '3.10' + if: matrix.os == 'buildjet-8vcpu-ubuntu-2204' && matrix.version == '3.10' && github.event_name == 'pull_request' uses: orgoro/coverage@v3.1 with: coverageFile: coverage.xml diff --git a/datadreamer/image_generation/sdxl_image_generator.py b/datadreamer/image_generation/sdxl_image_generator.py index 3f85e45..76e8963 100644 --- a/datadreamer/image_generation/sdxl_image_generator.py +++ b/datadreamer/image_generation/sdxl_image_generator.py @@ -89,12 +89,14 @@ def _init_processor(self) -> Tuple[Compel, Compel]: text_encoder=[self.base.text_encoder, self.base.text_encoder_2], returned_embeddings_type=ReturnedEmbeddingsType.PENULTIMATE_HIDDEN_STATES_NON_NORMALIZED, requires_pooled=[False, True], + device=self.device, ) compel_refiner = Compel( tokenizer=[self.refiner.tokenizer_2], text_encoder=[self.refiner.text_encoder_2], returned_embeddings_type=ReturnedEmbeddingsType.PENULTIMATE_HIDDEN_STATES_NON_NORMALIZED, requires_pooled=[True], + device=self.device, ) return compel, compel_refiner diff --git a/datadreamer/image_generation/sdxl_lightning_image_generator.py b/datadreamer/image_generation/sdxl_lightning_image_generator.py index af6e6d3..22d346f 100644 --- a/datadreamer/image_generation/sdxl_lightning_image_generator.py +++ b/datadreamer/image_generation/sdxl_lightning_image_generator.py @@ -84,6 +84,7 @@ def _init_compel(self) -> Compel: text_encoder=[self.pipe.text_encoder, self.pipe.text_encoder_2], returned_embeddings_type=ReturnedEmbeddingsType.PENULTIMATE_HIDDEN_STATES_NON_NORMALIZED, requires_pooled=[False, True], + device=self.device, ) return compel diff --git a/datadreamer/image_generation/sdxl_turbo_image_generator.py b/datadreamer/image_generation/sdxl_turbo_image_generator.py index 1368e62..b8ad1f7 100644 --- a/datadreamer/image_generation/sdxl_turbo_image_generator.py +++ b/datadreamer/image_generation/sdxl_turbo_image_generator.py @@ -66,6 +66,7 @@ def _init_compel(self) -> Compel: text_encoder=[self.base.text_encoder, self.base.text_encoder_2], returned_embeddings_type=ReturnedEmbeddingsType.PENULTIMATE_HIDDEN_STATES_NON_NORMALIZED, requires_pooled=[False, True], + device=self.device, ) return compel diff --git a/requirements.txt b/requirements.txt index e98ab53..76f85d7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ accelerate>=0.25.0 scipy>=1.10.0 bitsandbytes>=0.42.0 nltk>=3.8.1 -luxonis-ml[data,utils]>=0.6.6,<0.7 +luxonis-ml[data,utils]==0.8.0 python-box>=7.1.1 gcsfs>=2023.1.0 sentencepiece>=0.2.0