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

fix: Fix "to many steps: constrained dilation" exception for some cases #1220

Draft
wants to merge 9 commits into
base: develop
Choose a base branch
from
Draft
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
10 changes: 10 additions & 0 deletions .azure-pipelines/pyinstaller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,16 @@ steps:
displayName: install libs
- bash: python -m pip install .[pyinstaller] -c requirements/constraints_py3.12.txt
displayName: install partseg
- bash: |
bash build_utils/build_libomp.sh
condition: startsWith(variables['Agent.OS'], 'Darwin')
displayName: install libomp
env:
MACOSX_DEPLOYMENT_TARGET: 10.15
- bash: |
python -m pip install git+https://github.com/4DNucleome/PartSegCore-compiled-backend.git@mso_fix
displayName: install PartSegCore-compiled-backend from `mso_fix` branch
# https://github.com/4DNucleome/PartSegCore-compiled-backend/tree/mso_fix
- bash: |
python build_utils/create_and_pack_executable.py --no-simple-zip
displayName: build
Expand Down
19 changes: 19 additions & 0 deletions build_utils/build_libomp.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#!/usr/bin/env bash
set -euo pipefail
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
build_dir=${DIR}/libs_build

Check warning on line 4 in build_utils/build_libomp.sh

View check run for this annotation

Codacy Production / Codacy Static Code Analysis

build_utils/build_libomp.sh#L4

build_dir appears unused. Verify use (or export if used externally).
LLVM_VERSION=${LLVM_VERSION:-19.1.1}
INSTALL_CMD=${INSTALL_CMD:-"sudo make install"}

echo MACOSX_DEPLOYMENT_TARGET $MACOSX_DEPLOYMENT_TARGET

Check warning on line 8 in build_utils/build_libomp.sh

View check run for this annotation

Codacy Production / Codacy Static Code Analysis

build_utils/build_libomp.sh#L8

Double quote to prevent globbing and word splitting.

git clone --depth 1 --branch llvmorg-${LLVM_VERSION} https://github.com/llvm/llvm-project

Check warning on line 10 in build_utils/build_libomp.sh

View check run for this annotation

Codacy Production / Codacy Static Code Analysis

build_utils/build_libomp.sh#L10

Double quote to prevent globbing and word splitting.
pushd llvm-project/openmp
mkdir build
cd build
cmake -DCMAKE_C_COMPILER=${CC:-clang} -DCMAKE_CXX_COMPILER=${CXX:-clang++} ${CMAKE_FLAGS:-} ..

Check warning on line 14 in build_utils/build_libomp.sh

View check run for this annotation

Codacy Production / Codacy Static Code Analysis

build_utils/build_libomp.sh#L14

Double quote to prevent globbing and word splitting.
make ${MAKE_FLAGS:-}

Check warning on line 15 in build_utils/build_libomp.sh

View check run for this annotation

Codacy Production / Codacy Static Code Analysis

build_utils/build_libomp.sh#L15

Double quote to prevent globbing and word splitting.
${INSTALL_CMD}

popd
rm -rf llvm-project
2 changes: 1 addition & 1 deletion package/PartSegCore/segmentation/watershed.py
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ def sprawl(


class MSOWatershedParams(BaseModel):
step_limits: int = Field(100, ge=1, le=1000, title="Steep limits", description="Limits of Steps")
step_limits: int = Field(100, ge=1, le=10000, title="Steep limits", description="Limits of Steps")
reflective: bool = False


Expand Down
Loading