Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update docs #6

Closed
wants to merge 24 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions .github/workflows/wheel_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ jobs:
make &&
make install &&
cd .. &&
yum -y install maven java &&
bash ci-utils/install_prereq_linux.sh &&
mkdir -p /tmp/bfiocpp_bld &&
cp -r local_install /tmp/bfiocpp_bld
Expand All @@ -72,9 +71,18 @@ jobs:
CIBW_ENVIRONMENT_WINDOWS: PATH="$TEMP\\bfiocpp\\bin;$PATH" ON_GITHUB="TRUE" BFIO_CPP_DEP_DIR="C:\\TEMP\\bfiocpp_bld\\local_install" CMAKE_ARGS="-DCMAKE_GENERATOR=Ninja"
CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: "delvewheel repair -w {dest_dir} {wheel}"
CIBW_ARCHS: ${{ matrix.cibw_archs }}
CIBW_BEFORE_TEST_LINUX: yum -y install maven java
CIBW_TEST_REQUIRES: bfio requests numpy ome_zarr
CIBW_TEST_COMMAND: python -W default -m unittest discover -s {project}/tests -v

- name: Upload Artifact
uses: actions/upload-artifact@v3
with:
name: bfiocpp-wheels
path: dist/*.whl
retention-days: 1


build_wheels_apple_arm64:
name: Build wheels on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -122,6 +130,6 @@ jobs:
- name: Upload Artifact
uses: actions/upload-artifact@v3
with:
name: bfiocpp-wheels
name: bfiocpp-wheels-arm64
path: dist/*.whl
retention-days: 1
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.24)

set(CMAKE_VERBOSE_MAKEFILE ON)
project(bfio_cpp)
#==== Compiler Options
set(CMAKE_CXX_STANDARD 17)
Expand All @@ -14,7 +14,7 @@ endif()
message(STATUS "CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH}")
if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Release)
endif()
endif()

set(CMAKE_CXX_FLAGS_RELEASE "-O2")
set(SOURCE
Expand Down
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@
# if sys.maxsize > 2**32:
# cmake_args += ["-A", "x64"]
# build_args += ["--", "/m"]
else:
cmake_args += ["-DCMAKE_BUILD_TYPE=" + cfg]
else:

Check warning on line 63 in setup.py

View workflow job for this annotation

GitHub Actions / flake8

W291: trailing whitespace
build_args += ["--", "-j4"]


Check warning on line 65 in setup.py

View workflow job for this annotation

GitHub Actions / flake8

W293: blank line contains whitespace
cmake_args += ["-DCMAKE_BUILD_TYPE=" + cfg]
env = os.environ.copy()
env["CXXFLAGS"] = '{} -DVERSION_INFO=\\"{}\\"'.format(
env.get("CXXFLAGS", ""), versioneer.get_version()
Expand Down
Loading