diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index b36a6e7..ed00679 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -30,7 +30,7 @@ jobs: python-version: "3.10" pytorch-version: "2.1.*" - - name: MacOS (Python 3.11, PyTorch 2.4) + - name: MacOS ARM (Python 3.11, PyTorch 2.4) os: macos-latest cuda-version: "" gcc-version: "" @@ -38,6 +38,14 @@ jobs: python-version: "3.11" pytorch-version: "2.4.*" + - name: MacOS Intel (Python 3.11, PyTorch 2.4) + os: macos-13 + cuda-version: "" + gcc-version: "" + nvcc-version: "" + python-version: "3.11" + pytorch-version: "2.4.*" + steps: - name: "Check out" diff --git a/CMakeLists.txt b/CMakeLists.txt index aa16f3a..5fa4d43 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,7 +20,7 @@ SET (CMAKE_CXX_STANDARD 17) # Set flags for linking on mac IF(APPLE) SET (CMAKE_INSTALL_NAME_DIR "@rpath") - SET(EXTRA_COMPILE_FLAGS "-msse2 -stdlib=libc++") + SET(EXTRA_COMPILE_FLAGS "-stdlib=libc++") ENDIF(APPLE) # Select where to install diff --git a/devtools/conda-envs/build-macos-13.yml b/devtools/conda-envs/build-macos-13.yml new file mode 100644 index 0000000..6fb479b --- /dev/null +++ b/devtools/conda-envs/build-macos-13.yml @@ -0,0 +1,13 @@ +name: build +channels: + - conda-forge +dependencies: + - cmake + - compilers + - make + - openmm >=8.2 + - pip + - pytest + - python + - pytorch-cpu @PYTORCH_VERSION@ + - swig diff --git a/devtools/conda-envs/build-macos-latest.yml b/devtools/conda-envs/build-macos-latest.yml index 92c0c16..6fb479b 100644 --- a/devtools/conda-envs/build-macos-latest.yml +++ b/devtools/conda-envs/build-macos-latest.yml @@ -5,9 +5,9 @@ dependencies: - cmake - compilers - make - - openmm >=8.1 + - openmm >=8.2 - pip - pytest - python - pytorch-cpu @PYTORCH_VERSION@ - - swig \ No newline at end of file + - swig