Skip to content

Commit 2b0cf57

Browse files
committed
ci: try MacOS ci with faiss-cpu>=1.12
Signed-off-by: Élie Goudout <[email protected]>
1 parent 9d74007 commit 2b0cf57

File tree

4 files changed

+21
-7
lines changed

4 files changed

+21
-7
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ on:
66
pull_request:
77
branches: [develop, release]
88

9+
env:
10+
GITHUB_TOKEN: ${{ secrets.GH_TOKEN_TORCHHUB }}
11+
KMP_DUPLICATE_LIB_OK: TRUE
12+
913
jobs:
1014
build:
1115
name: continuous-integration
@@ -36,7 +40,7 @@ jobs:
3640
uv -v run mypy
3741
3842
- name: Build docs (Posix)
39-
if: matrix.os != 'windows-latest' && matrix.os != 'macos-latest' # Temporary (github.com/ThalesGroup/scio/issues/2)
43+
if: matrix.os != 'windows-latest'
4044
env:
4145
SPHINXOPTS: --fail-on-warning
4246
run: |
@@ -55,7 +59,6 @@ jobs:
5559
uv -v pip install dist/scio_pypi-1.0.0rc3-py3-none-any.whl
5660
5761
- name: Run pytest
58-
if: matrix.os != 'macos-latest' # Temporary (github.com/ThalesGroup/scio/issues/2)
5962
id: run-pytest
6063
continue-on-error: true
6164
run: |
@@ -82,7 +85,6 @@ jobs:
8285

8386
# TEMPORARILY DISABLED (https://github.com/ThalesGroup/scio/issues/9)
8487
# - name: Run pytest with lowest resolution
85-
# if: matrix.os != 'macos-latest' # Temporary (github.com/ThalesGroup/scio/issues/2)
8688
# id: run-pytest-lowest
8789
# continue-on-error: true
8890
# run: |

docs/src/tutorials/inferring_with_confidence.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,13 @@
2323
sample_shape = (3, 32, 32)
2424
calib_data = torch.rand(10, *sample_shape)
2525
calib_labels = torch.randint(0, 10, calib_data.shape)
26-
net = torch.hub.load("ThalesGroup/scio:hub", "tiniest", trust_repo=True, verbose=False)
26+
net = torch.hub.load(
27+
"ThalesGroup/scio:hub",
28+
"tiniest",
29+
trust_repo=True,
30+
verbose=False,
31+
skip_validation=True,
32+
)
2733
net = net.to(calib_data)
2834

2935
# %%

docs/src/tutorials/visualizing_and_evaluating_ood_detection_algorithms.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,13 @@
3131
calib_data = calib_data / 255 # Convert [0, 255] uint8 from HuggingFace to [0, 1] float
3232

3333
sample_shape = calib_data.shape[1:]
34-
net = torch.hub.load("ThalesGroup/scio:hub", "tiniest", trust_repo=True, verbose=False)
34+
net = torch.hub.load(
35+
"ThalesGroup/scio:hub",
36+
"tiniest",
37+
trust_repo=True,
38+
verbose=False,
39+
skip_validation=True,
40+
)
3541
net = net.to(calib_data)
3642

3743
# %%

docs/src/user_guide/installation_compatibility.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ If you wish to install from source or wheels manually, you can download `release
1818
1919
OS Compatibility
2020
----------------
21-
The library is available and functional on **Ubuntu**, **Windows** and *MacOS* (minus ``faiss``-related features ─ feel free to show your interest `here <https://github.com/ThalesGroup/scio/issues/2>`_).
21+
The library is available and functional on **Ubuntu**, **Windows** and *MacOS* (minus ``faiss``-related features ─ feel free to show your interest `here <https://github.com/ThalesGroup/scio/issues/2>`__).
2222

2323
Framework Compatiblity
2424
----------------------
2525
Although confidence scores are not a particularity of Neural Networks, ``scio`` is precisely developed to handle such models. More precisely, only *PyTorch* models (inheriting from ``torch.nn.Module``) are currently supported.
2626

2727
GPU Compatibility
2828
-----------------
29-
Our library is **fully compatible** and tested with CUDA devices for native use of GPU acceleration! Note however that features using ``faiss`` currently use CPU-bound indexes, introducing a potential GPU > CPU > GPU bottleneck. This may be improved in future versions ─ feel free to show your interest `here <https://github.com/ThalesGroup/scio/issues/18>`_.
29+
Our library is **fully compatible** and tested with CUDA devices for native use of GPU acceleration! Note however that features using ``faiss`` currently use CPU-bound indexes, introducing a potential GPU > CPU > GPU bottleneck. This may be improved in future versions ─ feel free to show your interest `here <https://github.com/ThalesGroup/scio/issues/18>`__.
3030

3131
Supported Data Types
3232
--------------------

0 commit comments

Comments
 (0)