diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c9716c148..42d176ebd 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,11 +17,15 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-latest] +<<<<<<< HEAD <<<<<<< HEAD python-version: [ '3.9', '3.10', '3.11', '3.12'] ======= python-version: ['3.9', '3.10', '3.11'] >>>>>>> 78ccf96c ([MAINT] Drop python 3.8 (#663)) +======= + python-version: ['3.9', '3.10', '3.11', '3.12'] +>>>>>>> 3c40944b ([MAINT] Support python `3.12` (#667)) steps: - uses: actions/checkout@v4 - uses: snok/install-poetry@v1 diff --git a/clinicadl/networks/old_network/cnn/random.py b/clinicadl/networks/old_network/cnn/random.py index 221fee3f5..38f889b0d 100644 --- a/clinicadl/networks/old_network/cnn/random.py +++ b/clinicadl/networks/old_network/cnn/random.py @@ -208,7 +208,7 @@ def fc_dict_design(n_fcblocks, convolutions, initial_shape, n_classes=2): out_channels = last_conv["out_channels"] flattened_shape = np.ceil(np.array(initial_shape) / 2**n_conv) flattened_shape[0] = out_channels - in_features = np.product(flattened_shape) + in_features = np.prod(flattened_shape) # Sample number of FC layers ratio = (in_features / n_classes) ** (1 / n_fcblocks) diff --git a/poetry.lock b/poetry.lock index 9f5396efb..185b01819 100644 --- a/poetry.lock +++ b/poetry.lock @@ -4576,6 +4576,17 @@ files = [ {file = "tzdata-2024.2.tar.gz", hash = "sha256:7d85cc416e9382e69095b7bdf4afd9e3880418a2413feec7069d533d6b4e31cc"}, ] +[[package]] +name = "tzdata" +version = "2024.2" +description = "Provider of IANA time zone data" +optional = false +python-versions = ">=2" +files = [ + {file = "tzdata-2024.2-py2.py3-none-any.whl", hash = "sha256:a48093786cdcde33cad18c2555e8532f34422074448fbc874186f0abd79565cd"}, + {file = "tzdata-2024.2.tar.gz", hash = "sha256:7d85cc416e9382e69095b7bdf4afd9e3880418a2413feec7069d533d6b4e31cc"}, +] + [[package]] name = "urllib3" version = "1.26.20" diff --git a/pyproject.toml b/pyproject.toml index cc74e792a..71b003ee0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,12 +28,17 @@ classifiers = [ [tool.poetry.dependencies] <<<<<<< HEAD +<<<<<<< HEAD python = ">=3.9,<3.13" torch = "^2.3.0" ======= python = ">=3.9,<3.12" torch = "^2.1.0" >>>>>>> 78ccf96c ([MAINT] Drop python 3.8 (#663)) +======= +python = ">=3.9,<3.13" +torch = "^2.3.0" +>>>>>>> 3c40944b ([MAINT] Support python `3.12` (#667)) torchvision = "*" tensorboard = "*" toml = "*"