diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml index a577278c1..5ea4fc805 100644 --- a/.github/workflows/build_linux.yml +++ b/.github/workflows/build_linux.yml @@ -29,25 +29,13 @@ jobs: sudo apt-get install -y cmake wget ninja-build libblas-dev liblapack-dev liblapacke-dev libboost-all-dev libopenmpi-dev libeigen3-dev libhdf5-dev sudo apt-get clean all - - name: Install Catch v3 - run: | - cd /tmp - wget -O Catch2.tar.gz https://github.com/catchorg/Catch2/archive/refs/tags/v3.6.0.tar.gz - tar xzf Catch2.tar.gz - rm Catch2.tar.gz - cd Catch2* - cmake -S . -B build -DBUILD_TESTING=OFF - cmake --build build - sudo cmake --install build - - name: Install HighFive run: | - cd /tmp wget -O HighFive.tar.gz https://github.com/BlueBrain/HighFive/archive/v2.9.0.tar.gz tar xzf HighFive.tar.gz rm HighFive.tar.gz cd HighFive* - cmake -DHIGHFIVE_EXAMPLES=OFF -DHIGHFIVE_USE_BOOST=OFF -DHIGHFIVE_UNIT_TESTS=OFF -S . -B build + cmake -S . -B build cmake --build build sudo cmake --install build @@ -59,10 +47,6 @@ jobs: run: |- cmake --build build.${{ matrix.build.type }} - - name: Install - run: |- - sudo cmake --install build.${{ matrix.build.type }} - - name: Run tests run: |- - smurff --bist + ./build.${{ matrix.build.type }}/bin/tests diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index a313f5223..95e9ef9fc 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -1,4 +1,4 @@ -name: Build Wheels +name: Build on: pull_request: diff --git a/ci/buildwheel/.gitignore b/ci/buildwheel/.gitignore new file mode 100644 index 000000000..3c6cbb417 --- /dev/null +++ b/ci/buildwheel/.gitignore @@ -0,0 +1,2 @@ +hdf5*/ +openblas*/ diff --git a/ci/buildwheel/Dockerfile b/ci/buildwheel/Dockerfile deleted file mode 100644 index 8b6e1c3be..000000000 --- a/ci/buildwheel/Dockerfile +++ /dev/null @@ -1,33 +0,0 @@ -FROM quay.io/pypa/manylinux2014_x86_64 - -RUN yum -y install wget eigen3-devel openblas-devel hdf5-devel && \ - yum clean all - -RUN wget https://cmake.org/files/v3.12/cmake-3.12.0-Linux-x86_64.sh && \ - sh cmake-3.12.0-Linux-x86_64.sh --prefix=/usr/local --exclude-subdir && \ - rm -f cmake-3.12.0-Linux-x86_64.sh - -#install HighFive -RUN wget -O HighFive.tar.gz https://github.com/BlueBrain/HighFive/archive/v2.2.tar.gz && \ - tar xzf HighFive.tar.gz && \ - rm HighFive.tar.gz && \ - cd HighFive* && \ - mkdir build && \ - cd build && \ - cmake .. -DHIGHFIVE_USE_BOOST=OFF && \ - make -j2 && \ - make install && \ - cd ../.. && \ - rm -r HighFive* - -#install pybind11 -RUN wget -O pybind11.tar.gz https://github.com/pybind/pybind11/archive/v2.5.0.tar.gz && \ - tar xzf pybind11.tar.gz && \ - rm pybind11.tar.gz && \ - cd pybind11* && \ - mkdir build && \ - cd build && \ - cmake .. -DPYBIND11_TEST=OFF && \ - make install && \ - cd ../.. && \ - rm -r pybind11* diff --git a/ci/buildwheel/install_deps.sh b/ci/buildwheel/install_deps.sh index 9f2386568..64f99c254 100755 --- a/ci/buildwheel/install_deps.sh +++ b/ci/buildwheel/install_deps.sh @@ -8,7 +8,7 @@ cd "$SCRIPT_DIR" echo "MACOSX_DEPLOYMENT_TARGET: [$MACOSX_DEPLOYMENT_TARGET]" echo "PWD: [$PWD]" -brew install --formulae eigen ../highfive.rb catch2 +brew install --formulae eigen ../highfive.rb brew uninstall --ignore-dependencies hdf5 ./install_hdf5.sh \ No newline at end of file diff --git a/ci/buildwheel/install_hdf5.py b/ci/buildwheel/install_hdf5.py new file mode 100755 index 000000000..22aa59a58 --- /dev/null +++ b/ci/buildwheel/install_hdf5.py @@ -0,0 +1,57 @@ +#!/usr/bin/env python3 + +import logging +from subprocess import check_call +import os +import shutil +from pathlib import Path +import h5py + +logging.basicConfig(level=logging.INFO) + +hdf5_basedir = Path(__file__).parent.absolute() +# hdf5_install_dir = hdf5_basedir / "hdf5" +hdf5_install_dir = Path("/usr/local/hdf5") + +if hdf5_install_dir.exists(): + logging.warn(f"install dir already exists: {hdf5_install_dir} -- skipping") + exit(0) + +major, minor, release = h5py.h5.get_libversion() +full = f"{major}.{minor}.{release}" +logging.info(f"found h5py version: {full}") + +h5py_package_dir = Path(h5py.__file__).parent +h5py_lib_dir = h5py_package_dir / '.dylibs' +logging.info(f"found h5py lib_dir: {h5py_lib_dir}") + +hdf5_src_dir = hdf5_basedir / f"hdf5-{full}" + +logging.info(f"building in : {hdf5_src_dir}") +logging.info(f"installing in : {hdf5_install_dir}") + +url = f"https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-{major}.{minor}/hdf5-{full}/src/hdf5-{full}.tar.gz" +logging.info(f"download: {url}") +check_call(f"wget -q {url} -O - | tar -xzf -", shell=True, cwd=hdf5_basedir) + +logging.info(f"build and install") +check_call(f""" + ./configure --prefix={hdf5_install_dir} && + make -j && + sudo mkdir -m 777 {hdf5_install_dir} && + make install""", + shell=True, + cwd=hdf5_src_dir) + +hdf5_lib_dir = hdf5_install_dir / "lib" +hdf5_lib_dir_backup = hdf5_install_dir / "lib.orig" + +logging.info(f"replace dylibs in {hdf5_lib_dir} from {h5py_lib_dir}") +for f in h5py_lib_dir.glob('*.dylib'): + logging.info(f" {f} -> {h5py_lib_dir}/") + shutil.copy(f, hdf5_lib_dir) + + + + + diff --git a/ci/converted/audit/audit_summary.md b/ci/converted/audit/audit_summary.md new file mode 100644 index 000000000..0d24d6ce9 --- /dev/null +++ b/ci/converted/audit/audit_summary.md @@ -0,0 +1,120 @@ +# Audit summary + +Summary for [Azure DevOps instance](https://dev.azure.com/ExaScience/smurff/_build) + +- GitHub Actions Importer version: **1.3.22039 (9432caa2d13df57db8619b9b253cdf994da6625c)** +- Performed at: **6/3/24 at 12:31** + +## Pipelines + +Total: **1** + +- Successful: **0 (0%)** +- Partially successful: **1 (100%)** +- Unsupported: **0 (0%)** +- Failed: **0 (0%)** + +### Job types + +Supported: **1 (100%)** + +- YAML: **1** + +### Build steps + +Total: **28** + +Known: **27 (96%)** + +- script: **10** +- bash: **9** +- PublishBuildArtifacts@1: **5** +- UsePythonVersion@0: **2** +- powershell: **1** + +Unknown: **1 (3%)** + +- CMake@1: **1** + +Actions: **35** + +- run: **20** +- actions/checkout@v4.1.0: **6** +- actions/upload-artifact@v4.1.0: **5** +- actions/setup-python@v5.0.0: **2** +- ./.github/actions/ci_conda_steps: **2** + +### Triggers + +Total: **2** + +Known: **2 (100%)** + +- pullRequest: **1** +- continuousIntegration: **1** + +Actions: **2** + +- pull_request: **1** +- push: **1** + +### Environment + +Total: **2** + +Known: **2 (100%)** + +- system_debug: **1** +- CPU_COUNT: **1** + +Actions: **2** + +- system_debug: **1** +- CPU_COUNT: **1** + +### Other + +Total: **20** + +Known: **20 (100%)** + +- matrix: **6** +- CIBW_TEST_REQUIRES: **2** +- CIBW_TEST_COMMAND: **2** +- CIBW_ENVIRONMENT: **2** +- CIBW_BUILD_VERBOSITY: **2** +- CIBW_BUILD: **2** +- CIBW_MANYLINUX_X86_64_IMAGE: **1** +- macOS_sdk_url: **1** +- macOS_sdk_filename: **1** +- maxParallel: **1** + +Actions: **20** + +- matrix: **6** +- CIBW_TEST_REQUIRES: **2** +- CIBW_TEST_COMMAND: **2** +- CIBW_ENVIRONMENT: **2** +- CIBW_BUILD_VERBOSITY: **2** +- CIBW_BUILD: **2** +- CIBW_MANYLINUX_X86_64_IMAGE: **1** +- macOS_sdk_url: **1** +- macOS_sdk_filename: **1** +- max_parallel: **1** + +### Manual tasks + +Total: **2** + +Self hosted runners: **2** + +- `macOS-latest`: **2** + +### Partially successful + +#### smurff/ExaScience.smurff + +- [pipelines/smurff/ExaScience.smurff/.github/workflows/exascience.smurff.yml](pipelines/smurff/ExaScience.smurff/.github/workflows/exascience.smurff.yml) +- [pipelines/smurff/ExaScience.smurff/.github/actions/ci_conda_steps/action.yml](pipelines/smurff/ExaScience.smurff/.github/actions/ci_conda_steps/action.yml) +- [pipelines/smurff/ExaScience.smurff/config.json](pipelines/smurff/ExaScience.smurff/config.json) +- [pipelines/smurff/ExaScience.smurff/source.yml](pipelines/smurff/ExaScience.smurff/source.yml) diff --git a/ci/converted/audit/config.yml b/ci/converted/audit/config.yml new file mode 100644 index 000000000..b5a10aa13 --- /dev/null +++ b/ci/converted/audit/config.yml @@ -0,0 +1,27 @@ +--- +composite_actions: +# Usage examples +# 1. Local composite action in actions folder (Default) +# Results in `uses: ./.github/actions/my_template` +# - name: my_template +# ref: main +# 2. Local composite action in another directory +# Results in `uses: ./path/to/action` +# - name: my_template +# ref: main +# path: path/to/action +# 3. Remote repository with composite action at the root of the repository +# Results in `uses: org/repo@ref` +# - name: my_template +# target_url: REDACTED +# ref: main +# 4. Remote repository with composite action in another directory +# Results in `uses: org/repo/path/to/action@ref` +# - name: my_template +# target_url: REDACTED +# ref: main +# path: path/to/action +- name: ci_conda_steps + ref: main +- name: ci_conda_steps + ref: main diff --git a/ci/converted/audit/log/valet-20240603-122921.log b/ci/converted/audit/log/valet-20240603-122921.log new file mode 100644 index 000000000..3268d3f22 --- /dev/null +++ b/ci/converted/audit/log/valet-20240603-122921.log @@ -0,0 +1,46 @@ +# Logfile created on 2024-06-03 12:29:21 +0000 by logger.rb/v1.6.0 +I, [2024-06-03T12:29:21.403827 #1] INFO -- : Using GitHub Features: Defaults +I, [2024-06-03T12:29:21.403934 #1] INFO -- : Auditing 'REDACTED_build' +I, [2024-06-03T12:29:21.407066 #1] INFO -- request: GET REDACTED_apis/distributedtask/tasks?api-version=5.0-preview +I, [2024-06-03T12:29:21.752834 #1] INFO -- response: Status 401 +I, [2024-06-03T12:29:21.786549 #1] INFO -- request: GET REDACTED +I, [2024-06-03T12:29:22.048730 #1] INFO -- response: Status 200 +I, [2024-06-03T12:29:22.066317 #1] INFO -- : Sending telemetry with transaction id '835c0ed2-d9c2-4c6b-ac88-8f93020fd4bb' +E, [2024-06-03T12:29:22.388744 #1] ERROR -- : There was an error extracting pipelines from Azure DevOps +Message: Unable to authenticate +Please verify your access token is valid and contains the following scopes: +Build (Read), Agent Pools (Read), Code (Read), Release (Read), Service Connections (Read), Task Groups (Read), Variable Groups (Read) +(GET 401) Unauthorized: REDACTED_apis/distributedtask/tasks?api-version=5.0-preview +/usr/local/bundle/gems/actions_importer-1.3.22039/lib/valet/services/azure_devops/parse_response.rb:14:in `parse!' +/usr/local/bundle/gems/actions_importer-1.3.22039/lib/valet/adapters/azure_devops/client.rb:139:in `block in fetch_all' +:187:in `loop' +/usr/local/bundle/gems/actions_importer-1.3.22039/lib/valet/adapters/azure_devops/client.rb:132:in `fetch_all' +/usr/local/bundle/gems/actions_importer-1.3.22039/lib/valet/adapters/azure_devops/client.rb:80:in `fetch_known_tasks' +/usr/local/bundle/gems/actions_importer-1.3.22039/lib/valet/transformers/azure_devops/utilities/task.rb:18:in `known_tasks' +/usr/local/bundle/gems/sorbet-runtime-0.5.11108/lib/types/private/methods/call_validation.rb:256:in `bind_call' +/usr/local/bundle/gems/sorbet-runtime-0.5.11108/lib/types/private/methods/call_validation.rb:256:in `validate_call' +/usr/local/bundle/gems/sorbet-runtime-0.5.11108/lib/types/private/methods/_methods.rb:275:in `block in _on_method_added' +/usr/local/bundle/gems/actions_importer-1.3.22039/lib/valet/services/azure_devops/extract_all_pipelines.rb:28:in `block in call' +/usr/local/bundle/gems/actions_importer-1.3.22039/lib/valet/services/azure_devops/extract_all_pipelines.rb:25:in `each' +/usr/local/bundle/gems/actions_importer-1.3.22039/lib/valet/services/azure_devops/extract_all_pipelines.rb:25:in `flat_map' +/usr/local/bundle/gems/actions_importer-1.3.22039/lib/valet/services/azure_devops/extract_all_pipelines.rb:25:in `call' +/usr/local/bundle/gems/sorbet-runtime-0.5.11108/lib/types/private/methods/call_validation.rb:256:in `bind_call' +/usr/local/bundle/gems/sorbet-runtime-0.5.11108/lib/types/private/methods/call_validation.rb:256:in `validate_call' +/usr/local/bundle/gems/sorbet-runtime-0.5.11108/lib/types/private/methods/_methods.rb:275:in `block in _on_method_added' +/usr/local/bundle/gems/actions_importer-1.3.22039/lib/valet/adapters/provider_resolver.rb:66:in `call' +/usr/local/bundle/gems/actions_importer-1.3.22039/lib/valet/commands/audit.rb:16:in `block in call' +/usr/local/bundle/gems/actions_importer-1.3.22039/lib/valet/logger.rb:96:in `with_progress_bar' +/usr/local/bundle/gems/actions_importer-1.3.22039/lib/valet/commands/audit.rb:15:in `call' +/usr/local/bundle/gems/actions_importer-1.3.22039/lib/valet/subcommands/audit.rb:50:in `azure_devops' +/usr/local/bundle/gems/thor-1.2.2/lib/thor/command.rb:27:in `run' +/usr/local/bundle/gems/thor-1.2.2/lib/thor/invocation.rb:127:in `invoke_command' +/usr/local/bundle/gems/thor-1.2.2/lib/thor.rb:392:in `dispatch' +/usr/local/bundle/gems/thor-1.2.2/lib/thor/invocation.rb:116:in `invoke' +/usr/local/bundle/gems/thor-1.2.2/lib/thor.rb:243:in `block in subcommand' +/usr/local/bundle/gems/thor-1.2.2/lib/thor/command.rb:27:in `run' +/usr/local/bundle/gems/thor-1.2.2/lib/thor/invocation.rb:127:in `invoke_command' +/usr/local/bundle/gems/thor-1.2.2/lib/thor.rb:392:in `dispatch' +/usr/local/bundle/gems/thor-1.2.2/lib/thor/base.rb:485:in `start' +/usr/local/bundle/gems/actions_importer-1.3.22039/exe/actions-importer:19:in `' +/usr/local/bundle/bin/actions-importer:25:in `load' +/usr/local/bundle/bin/actions-importer:25:in `
' diff --git a/ci/converted/audit/log/valet-20240603-123132.log b/ci/converted/audit/log/valet-20240603-123132.log new file mode 100644 index 000000000..e284c2657 --- /dev/null +++ b/ci/converted/audit/log/valet-20240603-123132.log @@ -0,0 +1,77 @@ +# Logfile created on 2024-06-03 12:31:32 +0000 by logger.rb/v1.6.0 +I, [2024-06-03T12:31:32.902351 #1] INFO -- : Using GitHub Features: Defaults +I, [2024-06-03T12:31:32.902472 #1] INFO -- : Auditing 'REDACTEDsmurff/_build' +I, [2024-06-03T12:31:32.905619 #1] INFO -- request: GET REDACTED_apis/distributedtask/tasks?api-version=5.0-preview +I, [2024-06-03T12:31:33.593570 #1] INFO -- response: Status 200 +I, [2024-06-03T12:31:33.608549 #1] INFO -- request: GET REDACTEDsmurff/_apis/build/definitions?api-version=5.0&includeAllProperties=true&queryOrder=lastModifiedDescending +I, [2024-06-03T12:31:33.930808 #1] INFO -- response: Status 200 +I, [2024-06-03T12:31:33.934034 #1] INFO -- : Thread collection size: 10 +I, [2024-06-03T12:31:33.964503 #1] INFO -- request: GET REDACTED-pipelines.yml?ref=master +I, [2024-06-03T12:31:34.253944 #1] INFO -- response: Status 200 +I, [2024-06-03T12:31:34.261199 #1] INFO -- request: GET REDACTEDsmurff/_apis/serviceendpoint/endpoints?api-version=5.0-preview +I, [2024-06-03T12:31:34.594033 #1] INFO -- response: Status 200 +I, [2024-06-03T12:31:34.598199 #1] INFO -- request: GET REDACTEDsmurff/_apis/distributedtask/variablegroups?api-version=5.0-preview&queryOrder=idDescending +I, [2024-06-03T12:31:34.915088 #1] INFO -- response: Status 200 +I, [2024-06-03T12:31:34.918525 #1] INFO -- request: GET REDACTEDsmurff/_apis/distributedtask/taskgroups?api-version=5.0-preview +I, [2024-06-03T12:31:34.982720 #1] INFO -- response: Status 200 +I, [2024-06-03T12:31:34.987524 #1] INFO -- request: GET REDACTED-steps.yml?ref=master +I, [2024-06-03T12:31:35.268511 #1] INFO -- response: Status 200 +I, [2024-06-03T12:31:35.276565 #1] INFO -- request: GET REDACTED_apis/release/definitions?api-version=5.0&queryOrder=idDescending +I, [2024-06-03T12:31:36.156937 #1] INFO -- response: Status 200 +D, [2024-06-03T12:31:36.185399 #1] DEBUG -- : [Transformers::AzureDevops::Pipeline::Steps]: Located transformer for 'script' +D, [2024-06-03T12:31:36.189066 #1] DEBUG -- : [Transformers::AzureDevops::Pipeline::Steps]: Located transformer for 'script' +D, [2024-06-03T12:31:36.191976 #1] DEBUG -- : [Transformers::AzureDevops::Pipeline::Steps]: Located transformer for 'script' +D, [2024-06-03T12:31:36.192411 #1] DEBUG -- : [Transformers::AzureDevops::Pipeline::Steps]: Failed to locate transformer for 'CMake@1' +D, [2024-06-03T12:31:36.192664 #1] DEBUG -- : [Transformers::AzureDevops::Pipeline::Steps]: Located transformer for 'script' +D, [2024-06-03T12:31:36.192953 #1] DEBUG -- : [Transformers::AzureDevops::Pipeline::Steps]: Located transformer for 'script' +D, [2024-06-03T12:31:36.193778 #1] DEBUG -- : [Transformers::AzureDevops::Strategy]: Located transformer for 'maxParallel' +D, [2024-06-03T12:31:36.193917 #1] DEBUG -- : [Transformers::AzureDevops::Strategy]: Located transformer for 'matrix' +D, [2024-06-03T12:31:36.194302 #1] DEBUG -- : [Transformers::AzureDevops::Pipeline::Steps]: Located transformer for 'composite_action' +D, [2024-06-03T12:31:36.194766 #1] DEBUG -- : [Transformers::AzureDevops::Pipeline::Steps]: Located transformer for 'bash' +D, [2024-06-03T12:31:36.195012 #1] DEBUG -- : [Transformers::AzureDevops::Pipeline::Steps]: Located transformer for 'bash' +D, [2024-06-03T12:31:36.195396 #1] DEBUG -- : [Transformers::AzureDevops::Pipeline::Steps]: Located transformer for 'bash' +D, [2024-06-03T12:31:36.195621 #1] DEBUG -- : [Transformers::AzureDevops::Pipeline::Steps]: Located transformer for 'script' +D, [2024-06-03T12:31:36.195821 #1] DEBUG -- : [Transformers::AzureDevops::Pipeline::Steps]: Located transformer for 'PublishBuildArtifacts@1' +D, [2024-06-03T12:31:36.196632 #1] DEBUG -- : [Transformers::AzureDevops::Strategy]: Located transformer for 'matrix' +D, [2024-06-03T12:31:36.197470 #1] DEBUG -- : [Transformers::AzureDevops::Pipeline::Steps]: Located transformer for 'script' +D, [2024-06-03T12:31:36.197805 #1] DEBUG -- : [Transformers::AzureDevops::Pipeline::Steps]: Located transformer for 'composite_action' +D, [2024-06-03T12:31:36.198048 #1] DEBUG -- : [Transformers::AzureDevops::Pipeline::Steps]: Located transformer for 'bash' +D, [2024-06-03T12:31:36.198256 #1] DEBUG -- : [Transformers::AzureDevops::Pipeline::Steps]: Located transformer for 'bash' +D, [2024-06-03T12:31:36.198460 #1] DEBUG -- : [Transformers::AzureDevops::Pipeline::Steps]: Located transformer for 'bash' +D, [2024-06-03T12:31:36.198684 #1] DEBUG -- : [Transformers::AzureDevops::Pipeline::Steps]: Located transformer for 'script' +D, [2024-06-03T12:31:36.198869 #1] DEBUG -- : [Transformers::AzureDevops::Pipeline::Steps]: Located transformer for 'PublishBuildArtifacts@1' +D, [2024-06-03T12:31:36.199246 #1] DEBUG -- : [Transformers::AzureDevops::Strategy]: Located transformer for 'matrix' +D, [2024-06-03T12:31:36.199675 #1] DEBUG -- : [Transformers::AzureDevops::Pipeline::Steps]: Located transformer for 'powershell' +D, [2024-06-03T12:31:36.199968 #1] DEBUG -- : [Transformers::AzureDevops::Pipeline::Steps]: Located transformer for 'script' +D, [2024-06-03T12:31:36.200220 #1] DEBUG -- : [Transformers::AzureDevops::Pipeline::Steps]: Located transformer for 'script' +D, [2024-06-03T12:31:36.200457 #1] DEBUG -- : [Transformers::AzureDevops::Pipeline::Steps]: Located transformer for 'PublishBuildArtifacts@1' +D, [2024-06-03T12:31:36.200768 #1] DEBUG -- : [Transformers::AzureDevops::Strategy]: Located transformer for 'matrix' +D, [2024-06-03T12:31:36.201164 #1] DEBUG -- : [Transformers::AzureDevops::Pipeline::Steps]: Located transformer for 'UsePythonVersion@0' +D, [2024-06-03T12:31:36.201653 #1] DEBUG -- : [Transformers::AzureDevops::Pipeline::Steps]: Located transformer for 'bash' +D, [2024-06-03T12:31:36.201936 #1] DEBUG -- : [Transformers::AzureDevops::Pipeline::Steps]: Located transformer for 'PublishBuildArtifacts@1' +D, [2024-06-03T12:31:36.202244 #1] DEBUG -- : [Transformers::AzureDevops::Strategy]: Located transformer for 'matrix' +D, [2024-06-03T12:31:36.202733 #1] DEBUG -- : [Transformers::AzureDevops::Pipeline::Steps]: Located transformer for 'bash' +D, [2024-06-03T12:31:36.202994 #1] DEBUG -- : [Transformers::AzureDevops::Pipeline::Steps]: Located transformer for 'UsePythonVersion@0' +D, [2024-06-03T12:31:36.203224 #1] DEBUG -- : [Transformers::AzureDevops::Pipeline::Steps]: Located transformer for 'bash' +D, [2024-06-03T12:31:36.203497 #1] DEBUG -- : [Transformers::AzureDevops::Pipeline::Steps]: Located transformer for 'PublishBuildArtifacts@1' +D, [2024-06-03T12:31:36.203804 #1] DEBUG -- : [Transformers::AzureDevops::Strategy]: Located transformer for 'matrix' +D, [2024-06-03T12:31:36.204062 #1] DEBUG -- : [Transformers::AzureDevops::Pipeline::On]: Located transformer for 'continuousIntegration' +D, [2024-06-03T12:31:36.204194 #1] DEBUG -- : [Transformers::AzureDevops::Pipeline::On]: Located transformer for 'pullRequest' +I, [2024-06-03T12:31:36.337350 #1] INFO -- : Output file(s): +I, [2024-06-03T12:31:36.345179 #1] INFO -- : tmp/audit/pipelines/smurff/ExaScience.smurff/.github/workflows/exascience.smurff.yml +I, [2024-06-03T12:31:36.346320 #1] INFO -- : tmp/audit/pipelines/smurff/ExaScience.smurff/.github/actions/ci_conda_steps/action.yml +I, [2024-06-03T12:31:36.346977 #1] INFO -- : tmp/audit/pipelines/smurff/ExaScience.smurff/config.json +I, [2024-06-03T12:31:36.347586 #1] INFO -- : tmp/audit/pipelines/smurff/ExaScience.smurff/source.yml +I, [2024-06-03T12:31:36.348640 #1] INFO -- : tmp/audit/config.yml +I, [2024-06-03T12:31:36.380060 #1] INFO -- : tmp/audit/workflow_usage.csv +I, [2024-06-03T12:31:36.387054 #1] INFO -- : tmp/audit/audit_summary.md +W, [2024-06-03T12:31:40.447131 #1] WARN -- : Secrets redacted in file(s): +W, [2024-06-03T12:31:40.447441 #1] WARN -- : tmp/audit/config.yml +W, [2024-06-03T12:31:40.447657 #1] WARN -- : tmp/audit/pipelines/smurff/ExaScience.smurff/source.yml +W, [2024-06-03T12:31:40.447912 #1] WARN -- : tmp/audit/pipelines/smurff/ExaScience.smurff/.github/workflows/exascience.smurff.yml +W, [2024-06-03T12:31:40.448421 #1] WARN -- : tmp/audit/log/valet-20240603-122921.log +W, [2024-06-03T12:31:40.448608 #1] WARN -- : tmp/audit/pipelines/smurff/ExaScience.smurff/config.json +W, [2024-06-03T12:31:40.448922 #1] WARN -- : tmp/audit/log/valet-20240603-123132.log +I, [2024-06-03T12:31:40.450847 #1] INFO -- request: GET https://api.github.com/user +I, [2024-06-03T12:31:40.672901 #1] INFO -- response: Status 200 +I, [2024-06-03T12:31:40.676522 #1] INFO -- : Sending telemetry with transaction id '63383a46-77ec-4e6d-9d99-8743b4237853' diff --git a/ci/converted/audit/pipelines/smurff/ExaScience.smurff/.github/actions/ci_conda_steps/action.yml b/ci/converted/audit/pipelines/smurff/ExaScience.smurff/.github/actions/ci_conda_steps/action.yml new file mode 100644 index 000000000..d3256b9d8 --- /dev/null +++ b/ci/converted/audit/pipelines/smurff/ExaScience.smurff/.github/actions/ci_conda_steps/action.yml @@ -0,0 +1,20 @@ +name: ci_conda_steps +runs: + using: composite + steps: + - name: Add conda to PATH + run: echo "##vso[task.prependpath]$CONDA/bin" + shell: bash + - name: Take ownership of conda installation + run: sudo chown -R $USER $CONDA + shell: bash + - name: Create Build environment + run: conda create --yes --quiet --name buildEnv conda-build + shell: bash + - name: Build using 'conda build' + run: |- + cd conda-recipes + source activate buildEnv + conda build --python ${{ matrix.PYTHON_VERSION }} -c vanderaa --output-folder ../conda_packages smurff + shell: bash + - uses: actions/upload-artifact@v4.1.0 \ No newline at end of file diff --git a/ci/converted/audit/pipelines/smurff/ExaScience.smurff/.github/workflows/exascience.smurff.yml b/ci/converted/audit/pipelines/smurff/ExaScience.smurff/.github/workflows/exascience.smurff.yml new file mode 100644 index 000000000..3955f8f09 --- /dev/null +++ b/ci/converted/audit/pipelines/smurff/ExaScience.smurff/.github/workflows/exascience.smurff.yml @@ -0,0 +1,174 @@ +name: smurff/ExaScience.smurff +on: + push: + branches: + - master + - release-* + - v* + pull_request: + branches: + - master +env: + CPU_COUNT: 2 + system_debug: 'false' +jobs: + Ubuntu_1604_Apt: + runs-on: ubuntu-latest + strategy: + max-parallel: 2 + matrix: + build.type: + - Debug + - Release + - RelNoOpenMP + - RelWithDebInfo + steps: + - name: checkout + uses: actions/checkout@v4.1.0 + - name: Apt install dependencies + run: |- + sudo add-apt-repository ppa:lkoppel/robotics + sudo apt-get update + sudo apt-get install -y wget ninja-build libblas-dev liblapack-dev liblapacke-dev libboost-all-dev libopenmpi-dev libeigen3-dev libhdf5-dev + sudo apt-get clean all + - name: Install HighFive + run: "wget -O HighFive.tar.gz REDACTED2.2.tar.gz \ntar xzf HighFive.tar.gz \nrm HighFive.tar.gz\ncd HighFive*\nmkdir build\ncd build \ncmake ..\nmake -j2\nsudo make install \ncd ../..\nrm -r HighFive*" + - name: Make Build Directory + run: mkdir build.${{ matrix.build.type }} +# # This item has no matching transformer +# - task: CMake@1 +# inputs: +# workingDirectory: build.${{ matrix.build.type }} +# cmakeArgs: "-G Ninja -DCMAKE_BUILD_TYPE=${{ matrix.build.type }} .. -DENABLE_PYTHON=OFF -DBOOST_ROOT=/usr" + - name: Run ninja + run: |- + cd build.${{ matrix.build.type }} + ninja + - name: Run tests + run: |- + cd build.${{ matrix.build.type }}/bin + ./tests + Conda_Linux: + runs-on: ubuntu-latest + strategy: + matrix: + PYTHON_VERSION: + - '3.7' + - '3.8' + - '3.9' + steps: + - name: checkout + uses: actions/checkout@v4.1.0 + - uses: "./.github/actions/ci_conda_steps" + Conda_macOS: + runs-on: + - self-hosted + - macOS-latest + env: + macOS_sdk_filename: "${{ runner.temp }}/MacOSX10.9.sdk.tar.gz" + macOS_sdk_url: REDACTED_SDKs/releases/download/v10.11.0.1/MacOSX10.9.sdk.tar.gz + strategy: + matrix: + PYTHON_VERSION: + - '3.7' + - '3.8' + - '3.9' + steps: + - name: checkout + uses: actions/checkout@v4.1.0 + - name: Install MacOSX10.9.sdk + run: |- + curl -L -o ${{ env.macOS_sdk_filename }} ${{ env.macOS_sdk_url }} + sudo mkdir -p /opt + sudo tar -xzvf ${{ env.macOS_sdk_filename }} -C /opt + - uses: "./.github/actions/ci_conda_steps" + Conda_Windows: + runs-on: windows-2019 + strategy: + matrix: + PYTHON_VERSION: + - '3.7' + - '3.8' + - '3.9' + steps: + - name: checkout + uses: actions/checkout@v4.1.0 + - name: Add conda to PATH + run: Write-Host "##vso[task.prependpath]$env:CONDA\Scripts" + shell: powershell + - name: Create Anaconda environment and install conda-build + run: conda create --yes --quiet --name buildEnv conda-build + - name: Build using "conda build" + run: |- + call activate buildEnv + cd conda-recipes + conda build --python ${{ matrix.PYTHON_VERSION }} -c vanderaa --output-folder ../conda_packages smurff + - uses: actions/upload-artifact@v4.1.0 + with: + path: conda_packages + linux_wheel: + runs-on: ubuntu-latest + env: + CIBW_BUILD: cp${{ matrix.PYTHON_VERSION }}-manylinux_x86_64 + CIBW_BUILD_VERBOSITY: 1 + CIBW_ENVIRONMENT: CMAKE_ARGS='-DENABLE_BOOST=OFF -DENABLE_CMDLINE=OFF -DENABLE_TESTS=OFF' CPU_COUNT=${{ env.CPU_COUNT }} + CIBW_MANYLINUX_X86_64_IMAGE: vanderaa/manylinux2014_x86_64_smurff + CIBW_TEST_COMMAND: pytest {project}/python/test + CIBW_TEST_REQUIRES: pytest parameterized + strategy: + matrix: + PYTHON_VERSION: + - '36' + - '37' + - '38' + - '39' + steps: + - name: checkout + uses: actions/checkout@v4.1.0 + - uses: actions/setup-python@v5.0.0 + - name: Run cibuildwheel + run: |- + python3 -m pip install --upgrade pip + pip3 install cibuildwheel==1.10.0 + cibuildwheel --output-dir wheelhouse . + shell: bash + - uses: actions/upload-artifact@v4.1.0 + with: + path: wheelhouse + macos_wheel: + runs-on: + - self-hosted + - macOS-latest + env: + CIBW_BUILD: cp${{ matrix.PYTHON_VERSION }}-macosx_x86_64 + CIBW_BUILD_VERBOSITY: 1 + CIBW_ENVIRONMENT: CMAKE_ARGS='-DENABLE_BOOST=OFF -DENABLE_CMDLINE=OFF -DENABLE_TESTS=OFF -DCMAKE_PREFIX_PATH=/usr/local/opt/lapack' CPU_COUNT=${{ env.CPU_COUNT }} + CIBW_TEST_COMMAND: pytest {project}/python/test + CIBW_TEST_REQUIRES: pytest parameterized + strategy: + matrix: + PYTHON_VERSION: + - '36' + - '37' + - '38' + - '39' + steps: + - name: checkout + uses: actions/checkout@v4.1.0 + - name: Install dependencies using HomeBrew + run: |- + brew install eigen + brew install lapack + brew install pybind11 + brew install ci/highfive.rb + shell: bash + - uses: actions/setup-python@v5.0.0 + - name: Run cibuildwheel + run: |- + python3 -m pip install --upgrade pip + pip3 install cibuildwheel==1.10.0 + cibuildwheel --output-dir wheelhouse . + shell: bash + - uses: actions/upload-artifact@v4.1.0 + with: + path: wheelhouse diff --git a/ci/converted/audit/pipelines/smurff/ExaScience.smurff/config.json b/ci/converted/audit/pipelines/smurff/ExaScience.smurff/config.json new file mode 100644 index 000000000..3014a24c9 --- /dev/null +++ b/ci/converted/audit/pipelines/smurff/ExaScience.smurff/config.json @@ -0,0 +1,159 @@ +{ + "triggers": [ + { + "branchFilters": [ + "+master", + "+release-*", + "+v*" + ], + "pathFilters": [ + + ], + "settingsSourceType": 2, + "batchChanges": false, + "maxConcurrentBuildsPerBranch": 1, + "triggerType": "continuousIntegration" + }, + { + "branchFilters": [ + "+master" + ], + "forks": { + "enabled": true, + "allowSecrets": false, + "allowFullAccessToken": false + }, + "pathFilters": [ + + ], + "requireCommentsForNonTeamMembersOnly": false, + "requireCommentsForNonTeamMemberAndNonContributors": false, + "isCommentRequiredForPullRequest": false, + "pipelineTriggerSettings": { + "forkProtectionEnabled": false, + "buildsEnabledForForks": false, + "enforceJobAuthScopeForForks": false, + "enforceNoAccessToSecretsFromForks": false, + "isCommentRequiredForPullRequest": false, + "requireCommentsForNonTeamMembersOnly": false, + "requireCommentsForNonTeamMemberAndNonContributors": false + }, + "triggerType": "pullRequest" + } + ], + "variables": { + "system.debug": { + "value": "false", + "allowOverride": true + } + }, + "properties": { + }, + "tags": [ + + ], + "_links": { + "self": { + "href": "REDACTED67baa741-8ede-429d-a31b-08e8fea0c141/_apis/build/Definitions/1?revision=3" + }, + "web": { + "href": "REDACTED67baa741-8ede-429d-a31b-08e8fea0c141/_build/definition?definitionId=1" + }, + "editor": { + "href": "REDACTED67baa741-8ede-429d-a31b-08e8fea0c141/_build/designer?id=1&_a=edit-build-definition" + }, + "badge": { + "href": "REDACTED67baa741-8ede-429d-a31b-08e8fea0c141/_apis/build/status/1" + } + }, + "comment": "Change YAML file to ./ci/azure-pipelines.yml", + "jobAuthorizationScope": "projectCollection", + "jobTimeoutInMinutes": 60, + "jobCancelTimeoutInMinutes": 5, + "badgeEnabled": true, + "process": { + "yamlFilename": "./ci/azure-pipelines.yml", + "type": 2 + }, + "repository": { + "properties": { + "apiUrl": "REDACTED", + "branchesUrl": "REDACTED", + "cloneUrl": "REDACTED", + "fullName": "ExaScience/smurff", + "manageUrl": "REDACTED", + "refsUrl": "REDACTED", + "defaultBranch": "master", + "connectedServiceId": "0ebc2ba1-f090-4633-a54c-06f6baa0a152", + "isPrivate": "False", + "isFork": "True", + "ownerAvatarUrl": "REDACTED2.githubusercontent.com/u/5629178?v=4", + "lastUpdated": "12/03/2018 14:23:13", + "nodeId": "MDEwOlJlcG9zaXRvcnk3MDkwNjM0MA==", + "hasAdminPermissions": "True", + "safeOwnerId": "5629178", + "safeOwnerName": "ExaScience", + "safeRepository": "ExaScience/smurff", + "ownerIsAUser": "False", + "reportBuildStatus": "true" + }, + "id": "ExaScience/smurff", + "type": "GitHub", + "name": "ExaScience/smurff", + "url": "REDACTED", + "defaultBranch": "master", + "clean": null, + "checkoutSubmodules": false + }, + "quality": "definition", + "authoredBy": { + "displayName": "Tom Vander Aa (imec)", + "url": "REDACTED4.vssps.visualstudio.com/Ade9a5bea-f45a-4318-bf18-f4fb48cd0dc6/_apis/Identities/2e41751e-6ea3-635b-b614-7e79eba505d0", + "_links": { + "avatar": { + "href": "REDACTED_apis/GraphProfile/MemberAvatars/aad.MmU0MTc1MWUtNmVhMy03MzViLWI2MTQtN2U3OWViYTUwNWQw" + } + }, + "id": "2e41751e-6ea3-635b-b614-7e79eba505d0", + "uniqueName": "vanderaa@imec.be", + "imageUrl": "REDACTED_apis/GraphProfile/MemberAvatars/aad.MmU0MTc1MWUtNmVhMy03MzViLWI2MTQtN2U3OWViYTUwNWQw", + "descriptor": "aad.MmU0MTc1MWUtNmVhMy03MzViLWI2MTQtN2U3OWViYTUwNWQw" + }, + "drafts": [ + + ], + "queue": { + "_links": { + "self": { + "href": "REDACTED_apis/build/Queues/6" + } + }, + "id": 6, + "name": "Hosted Ubuntu 1604", + "url": "REDACTED_apis/build/Queues/6", + "pool": { + "id": 6, + "name": "Hosted Ubuntu 1604", + "isHosted": true + } + }, + "id": 1, + "name": "ExaScience.smurff", + "url": "REDACTED67baa741-8ede-429d-a31b-08e8fea0c141/_apis/build/Definitions/1?revision=3", + "uri": "vstfsREDACTED1", + "path": "\\", + "type": "build", + "queueStatus": "enabled", + "revision": 3, + "createdDate": "2020-01-25T08:40:07.98Z", + "project": { + "id": "67baa741-8ede-429d-a31b-08e8fea0c141", + "name": "smurff", + "description": "Automatic testing and packaging of REDACTED", + "url": "REDACTED_apis/projects/67baa741-8ede-429d-a31b-08e8fea0c141", + "state": "wellFormed", + "revision": 12, + "visibility": "public", + "lastUpdateTime": "2021-01-05T08:33:31.35Z" + } +} \ No newline at end of file diff --git a/ci/converted/audit/pipelines/smurff/ExaScience.smurff/source.yml b/ci/converted/audit/pipelines/smurff/ExaScience.smurff/source.yml new file mode 100644 index 000000000..74f3ca114 --- /dev/null +++ b/ci/converted/audit/pipelines/smurff/ExaScience.smurff/source.yml @@ -0,0 +1,175 @@ +--- +trigger: +- master +- release-* +- v* +variables: + CPU_COUNT: 2 +jobs: +- job: Ubuntu_1604_Apt + pool: + vmImage: ubuntu-latest + strategy: + maxParallel: 2 + matrix: + Debug: + build.type: Debug + Release: + build.type: Release + RelNoOpenMP: + build.type: RelNoOpenMP + RelWithDebInfo: + build.type: RelWithDebInfo + steps: + - script: | + sudo add-apt-repository ppa:lkoppel/robotics + sudo apt-get update + sudo apt-get install -y wget ninja-build libblas-dev liblapack-dev liblapacke-dev libboost-all-dev libopenmpi-dev libeigen3-dev libhdf5-dev + sudo apt-get clean all + displayName: Apt install dependencies + - script: "wget -O HighFive.tar.gz REDACTED2.2.tar.gz + \ntar xzf HighFive.tar.gz \nrm HighFive.tar.gz\ncd HighFive*\nmkdir build\ncd + build \ncmake ..\nmake -j2\nsudo make install \ncd ../..\nrm -r HighFive*\n" + displayName: Install HighFive + - script: 'mkdir build.$(build.type) + + ' + displayName: Make Build Directory + - task: CMake@1 + inputs: + workingDirectory: build.$(build.type) + cmakeArgs: "-G Ninja -DCMAKE_BUILD_TYPE=$(build.type) .. -DENABLE_PYTHON=OFF + -DBOOST_ROOT=/usr" + - script: | + cd build.$(build.type) + ninja + displayName: Run ninja + - script: | + cd build.$(build.type)/bin + ./tests + displayName: Run tests +- job: Conda_Linux + strategy: + matrix: + Python37: + PYTHON_VERSION: '3.7' + Python38: + PYTHON_VERSION: '3.8' + Python39: + PYTHON_VERSION: '3.9' + pool: + vmImage: ubuntu-latest + steps: + - template: conda-steps.yml +- job: Conda_macOS + strategy: + matrix: + Python37: + PYTHON_VERSION: '3.7' + Python38: + PYTHON_VERSION: '3.8' + Python39: + PYTHON_VERSION: '3.9' + pool: + vmImage: macOS-latest + variables: + macOS_sdk_url: REDACTED_SDKs/releases/download/v10.11.0.1/MacOSX10.9.sdk.tar.gz + macOS_sdk_filename: "$(Agent.TempDirectory)/MacOSX10.9.sdk.tar.gz" + steps: + - script: | + curl -L -o $(macOS_sdk_filename) $(macOS_sdk_url) + sudo mkdir -p /opt + sudo tar -xzvf $(macOS_sdk_filename) -C /opt + displayName: Install MacOSX10.9.sdk + - template: conda-steps.yml +- job: Conda_Windows + strategy: + matrix: + Python37: + PYTHON_VERSION: '3.7' + Python38: + PYTHON_VERSION: '3.8' + Python39: + PYTHON_VERSION: '3.9' + pool: + vmImage: windows-2019 + steps: + - powershell: Write-Host "##vso[task.prependpath]$env:CONDA\Scripts" + displayName: Add conda to PATH + - script: conda create --yes --quiet --name buildEnv conda-build + displayName: Create Anaconda environment and install conda-build + - script: | + call activate buildEnv + cd conda-recipes + conda build --python $(PYTHON_VERSION) -c vanderaa --output-folder ../conda_packages smurff + displayName: Build using "conda build" + - task: PublishBuildArtifacts@1 + inputs: + pathtoPublish: conda_packages +- job: linux_wheel + strategy: + matrix: + Python36: + PYTHON_VERSION: '36' + Python37: + PYTHON_VERSION: '37' + Python38: + PYTHON_VERSION: '38' + Python39: + PYTHON_VERSION: '39' + variables: + CIBW_BUILD: cp$(PYTHON_VERSION)-manylinux_x86_64 + CIBW_MANYLINUX_X86_64_IMAGE: vanderaa/manylinux2014_x86_64_smurff + CIBW_ENVIRONMENT: CMAKE_ARGS='-DENABLE_BOOST=OFF -DENABLE_CMDLINE=OFF -DENABLE_TESTS=OFF' + CPU_COUNT=$(CPU_COUNT) + CIBW_TEST_REQUIRES: pytest parameterized + CIBW_TEST_COMMAND: pytest {project}/python/test + CIBW_BUILD_VERBOSITY: 1 + pool: + vmImage: ubuntu-latest + steps: + - task: UsePythonVersion@0 + - bash: | + python3 -m pip install --upgrade pip + pip3 install cibuildwheel==1.10.0 + cibuildwheel --output-dir wheelhouse . + displayName: Run cibuildwheel + - task: PublishBuildArtifacts@1 + inputs: + pathtoPublish: wheelhouse +- job: macos_wheel + strategy: + matrix: + Python36: + PYTHON_VERSION: '36' + Python37: + PYTHON_VERSION: '37' + Python38: + PYTHON_VERSION: '38' + Python39: + PYTHON_VERSION: '39' + variables: + CIBW_BUILD: cp$(PYTHON_VERSION)-macosx_x86_64 + CIBW_ENVIRONMENT: CMAKE_ARGS='-DENABLE_BOOST=OFF -DENABLE_CMDLINE=OFF -DENABLE_TESTS=OFF + -DCMAKE_PREFIX_PATH=/usr/local/opt/lapack' CPU_COUNT=$(CPU_COUNT) + CIBW_TEST_REQUIRES: pytest parameterized + CIBW_TEST_COMMAND: pytest {project}/python/test + CIBW_BUILD_VERBOSITY: 1 + pool: + vmImage: macOS-latest + steps: + - bash: | + brew install eigen + brew install lapack + brew install pybind11 + brew install ci/highfive.rb + displayName: Install dependencies using HomeBrew + - task: UsePythonVersion@0 + - bash: | + python3 -m pip install --upgrade pip + pip3 install cibuildwheel==1.10.0 + cibuildwheel --output-dir wheelhouse . + displayName: Run cibuildwheel + - task: PublishBuildArtifacts@1 + inputs: + pathtoPublish: wheelhouse diff --git a/ci/converted/audit/workflow_usage.csv b/ci/converted/audit/workflow_usage.csv new file mode 100644 index 000000000..a68ed0694 --- /dev/null +++ b/ci/converted/audit/workflow_usage.csv @@ -0,0 +1,11 @@ +Pipeline,Action,File path +smurff/ExaScience.smurff,actions/checkout@v4.1.0,tmp/audit/pipelines/smurff/ExaScience.smurff/.github/workflows/exascience.smurff.yml +smurff/ExaScience.smurff,./.github/actions/ci_conda_steps,tmp/audit/pipelines/smurff/ExaScience.smurff/.github/workflows/exascience.smurff.yml +smurff/ExaScience.smurff,actions/upload-artifact@v4.1.0,tmp/audit/pipelines/smurff/ExaScience.smurff/.github/workflows/exascience.smurff.yml +smurff/ExaScience.smurff,actions/setup-python@v5.0.0,tmp/audit/pipelines/smurff/ExaScience.smurff/.github/workflows/exascience.smurff.yml + +Pipeline,Secret,File path + + +Pipeline,Runner,File path +smurff/ExaScience.smurff,macOS-latest,tmp/audit/pipelines/smurff/ExaScience.smurff/.github/workflows/exascience.smurff.yml \ No newline at end of file diff --git a/cmake/DependenciesConfig.cmake b/cmake/DependenciesConfig.cmake index b465cb531..56ea764ed 100644 --- a/cmake/DependenciesConfig.cmake +++ b/cmake/DependenciesConfig.cmake @@ -126,7 +126,6 @@ endmacro(configure_boost) macro(configure_python) if(ENABLE_PYTHON) - set(PYBIND11_FINDPYTHON ON) set(PYBIND11_NEWPYTHON ON) find_package(pybind11 CONFIG REQUIRED) endif() diff --git a/conda-recipes/smurff/meta.yaml b/conda-recipes/smurff/meta.yaml index 19a957851..9f18b2f11 100644 --- a/conda-recipes/smurff/meta.yaml +++ b/conda-recipes/smurff/meta.yaml @@ -21,7 +21,6 @@ requirements: - mkl-devel # [blas_impl == 'mkl'] - openblas # [blas_impl != 'mkl'] - eigen - - catch2 - libboost-devel - pybind11 - highfive >=2.2 diff --git a/conda-recipes/smurff/run_test.bat b/conda-recipes/smurff/run_test.bat index 67130bced..f782845af 100644 --- a/conda-recipes/smurff/run_test.bat +++ b/conda-recipes/smurff/run_test.bat @@ -1,4 +1 @@ -%CONDA_PREFIX%\Scripts\smurff --bist ~[random] -if errorlevel 1 exit 1 %PYTHON% -m pytest -if errorlevel 1 exit 1 \ No newline at end of file diff --git a/conda-recipes/smurff/run_test.sh b/conda-recipes/smurff/run_test.sh index 4dcf42ab5..8a7d9bcd7 100644 --- a/conda-recipes/smurff/run_test.sh +++ b/conda-recipes/smurff/run_test.sh @@ -1,2 +1 @@ -$PREFIX/bin/smurff --bist $PYTHON -m pytest -v python/test \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index 54256ea82..29587b5a1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -50,6 +50,7 @@ classifiers = [ "Topic :: Scientific/Engineering :: Artificial Intelligence", ] dependencies = [ + "h5py", "h5sparse-tensor", "numpy", "pandas",