clear cgal cache

try out just intel
build-all.py - remove unused wasm flags
2026-08-06 16:01:36 +00:00 · 2025-10-30 19:20:37 +05:00 · 2025-10-30 18:54:31 +05:00 · 2025-10-30 18:53:56 +05:00 · 2025-10-30 18:53:55 +05:00 · 2025-10-30 18:53:55 +05:00
3 changed files with 18 additions and 19 deletions
@@ -14,10 +14,6 @@ jobs:
            runner: macos-14
            arch: x64
            oldarch: 
-          - os: macos
-            runner: macos-14
-            arch: arm64
-            oldarch: m1

    steps:
      - name: Checkout Repository
@@ -47,6 +43,7 @@ jobs:

      - name: Unpack Dependencies
        run: |
+          rm -rf ./build/*/*/*/install/*gmp* ./build/*/*/*/install/*cgal*
          install_root=$(find ./build -maxdepth 4 -type d -name install 2>/dev/null | head -n 1 || true)
          [ -n "$install_root" ] && find "$install_root" -type f -name 'cache-*.tar.gz' -maxdepth 1 -exec tar -xzf {} -C "$install_root" \; || true

@@ -75,8 +72,8 @@ jobs:
            /usr/local/bin/brew install gettext openssl
          fi
          set -o pipefail
-          CXXFLAGS="-O3" CFLAGS="-O3 ${DARWIN_C_SOURCE}" ADD_COMMIT_SHA=1 BUILD_CFG=Release \
-            python3 ./nix/build-all.py -v --diskcleanup ${MAC_INTEL} \
+          IFCOS_SCHEMAS=4 CXXFLAGS="-O3" CFLAGS="-O3 ${DARWIN_C_SOURCE}" ADD_COMMIT_SHA=1 BUILD_CFG=Release \
+            python3 ./nix/build-all.py -v -py-313 --diskcleanup ${MAC_INTEL} \
            | tee build.log

      - name: Upload Build Logs
@@ -382,11 +382,13 @@ if MAC_CROSS_COMPILE_INTEL:
    MAC_CROSS_COMPILE_INTEL_BJAM_ARGS = ["architecture=x86"]
    MAC_CROSS_COMPILE_INTEL_CXX = "clang++ -arch x86_64"
    MAC_CROSS_COMPILE_INTEL_CC = "clang -arch x86_64"
+    MAC_CROSS_COMPILE_INTEL_AUTOCONF_HOST_ARGS = ["--host=x86_64-apple-darwin"]
 else:
    MAC_CROSS_COMPILE_INTEL_ARGS = []
    MAC_CROSS_COMPILE_INTEL_BJAM_ARGS = []
    MAC_CROSS_COMPILE_INTEL_CXX = ""
    MAC_CROSS_COMPILE_INTEL_CC = ""
+    MAC_CROSS_COMPILE_INTEL_AUTOCONF_HOST_ARGS = []

 OFF_ON = ["OFF", "ON"]
 BUILD_STATIC = "shared" not in flags
@@ -1195,7 +1197,9 @@ if "cgal" in targets:
    OLD_CC = None
    if MAC_CROSS_COMPILE_INTEL:
        OLD_CC = os.environ.get("CC")
+        # Otherwise it's using arm64 `gcc` and fails to build gmp.
        os.environ["CC"] = MAC_CROSS_COMPILE_INTEL_CC
+        gmp_args.extend(MAC_CROSS_COMPILE_INTEL_AUTOCONF_HOST_ARGS)

    build_dependency(
        name=f"gmp-{GMP_VERSION}",
@@ -1448,10 +1452,7 @@ if "IfcOpenShell-Python" in targets:
    # On OSX the actual Python library is not linked against.
    ADDITIONAL_ARGS = ""
    if platform.system() == "Darwin":
-        ADDITIONAL_ARGS = "-Wl,-flat_namespace,-undefined,suppress"
-
-    if "wasm" in flags:
-        ADDITIONAL_ARGS = "-Wl,-undefined,suppress"
+        ADDITIONAL_ARGS = "-Wl,-undefined,dynamic_lookup"

    # NOTE: We don't use `CXXFLAGS` for wrappers, so wrapper is compiled with different flags
    # (e.g. ` -fdata-sections` is missing, which is set by default for executables)
@@ -1516,7 +1517,7 @@ if "IfcOpenShell-Python" in targets:

        logger.info(f"\rBuilding python {python_version} wrapper...   ")

-        run([make, f"-j{IFCOS_NUM_BUILD_PROCS}", "ifcopenshell_wrapper"], cwd=python_dir)
+        run([make, f"-j{IFCOS_NUM_BUILD_PROCS}", "ifcopenshell_wrapper", "VERBOSE=1"], cwd=python_dir)
        run([make, "install/local"], cwd=os.path.join(python_dir, "ifcwrap"))

        if python_executable:
@@ -225,10 +225,10 @@ class FormatTransformer(lark.Transformer):
        if not args:
            return True
        token = args[0]
-        if hasattr(token, 'type'):
-            return token.type == 'TRUE'
+        if hasattr(token, "type"):
+            return token.type == "TRUE"
        value = str(token).lower()
-        if hasattr(token, 'value'):
+        if hasattr(token, "value"):
            value = str(token.value).lower()
        return value in ("true", "1", "yes")

@@ -275,13 +275,14 @@ class FormatTransformer(lark.Transformer):
            value, precision, input_unit, output_unit, suppress_zero_inches = args
            input_unit = "inch" if input_unit == "inch" else "foot"
            output_unit = "inch" if output_unit == "inch" else "foot"
-        
+
        return ifcopenshell.util.unit.format_length(
-            float(value), int(precision), 
+            float(value),
+            int(precision),
            suppress_zero_inches=suppress_zero_inches,
-            unit_system="imperial", 
-            input_unit=input_unit, 
-            output_unit=output_unit
+            unit_system="imperial",
+            input_unit=input_unit,
+            output_unit=output_unit,
        )

    def int(self, args: list[str]) -> str:
Author	SHA1	Message	Date
Andrej730	e9d003c22f	clear cgal cache	2025-10-30 19:20:37 +05:00
Andrej730	2e71e002fc	try out just intel	2025-10-30 18:54:31 +05:00
Andrej730	40ed2fe3ab	build-all.py - remove unused wasm flags `-Wl,-undefined,suppress` have no meaning in emscripten and they are just ignored. And emscripten is ignoring undefined symbols by default without any flags.	2025-10-30 18:53:56 +05:00
Andrej730	379fe632a3	build-all.py - switch to dynamic_lookup 1) `-undefined,suppress` is deprecated and linking is sending warnings about it and it seems to be superseded by `dynamic_lookup` 2) `-flat_namespace` is not compatible with GMP when building for intel, for some reason and results in horrible errors during linking: Example error: ``` ld: branch8 out of range 366651 in ___gmpn_add_nc final section layout: __TEXT addr=0x00000000, size=0x02d09000, fileOffset=0x00000000 __text addr=0x00001400, size=0x0264a5e4, fileOffset=0x00001400 __stubs addr=0x0264b9e4, size=0x0000423c, fileOffset=0x0264b9e4 __stub_helper addr=0x0264fc20, size=0x00006c58, fileOffset=0x0264fc20 __gcc_except_tab addr=0x02656878, size=0x002efc04, fileOffset=0x02656878 __const addr=0x02946480, size=0x001cdc18, fileOffset=0x02946480 __cstring addr=0x02b140a0, size=0x0014324b, fileOffset=0x02b140a0 __unwind_info addr=0x02c572ec, size=0x0008d2d0, fileOffset=0x02c572ec __eh_frame addr=0x02ce45c0, size=0x00024a30, fileOffset=0x02ce45c0 __DATA_CONST addr=0x02d09000, size=0x0022b000, fileOffset=0x02d09000 __got addr=0x02d09000, size=0x00001dc8, fileOffset=0x02d09000 __mod_init_func addr=0x02d0adc8, size=0x00000690, fileOffset=0x02d0adc8 __const addr=0x02d0b460, size=0x00227fd0, fileOffset=0x02d0b460 __DATA addr=0x02f34000, size=0x000c3000, fileOffset=0x02f34000 __la_symbol_ptr addr=0x02f34000, size=0x000056a0, fileOffset=0x02f34000 __data addr=0x02f396a0, size=0x0005f7b8, fileOffset=0x02f396a0 __thread_vars addr=0x02f98e58, size=0x000006d8, fileOffset=0x02f98e58 __thread_ptrs addr=0x02f99530, size=0x00000178, fileOffset=0x02f99530 __thread_data addr=0x02f996b0, size=0x000000d8, fileOffset=0x02f996b0 __thread_bss addr=0x02f99790, size=0x00018850, fileOffset=0x02f99790 __bss addr=0x02fb1fe0, size=0x0003b0c0, fileOffset=0x00000000 __common addr=0x02fed0a0, size=0x00009098, fileOffset=0x00000000 __LINKEDIT addr=0x02ff7000, size=0x0148e000, fileOffset=0x02fb2000 clang: error: linker command failed with exit code 1 (use -v to see invocation) ```	2025-10-30 18:53:55 +05:00
Andrej730	2ecaee9024	build-all.py - add `VERBOSE=1` to the wrapper make command	2025-10-30 18:53:55 +05:00
Andrej730	f9a3c9a994	build-all.py - fix missing mac cross compilation host args in gmp I guess something has changed in gmp 6.3.0 and this issue become more apparent. Example error: ``` tmp-cnd_sub_n.s:133:14: error: tmp-cnd_add_n.sbrackets expression not supported on this target: 130 stp x8, x9, [x1,#16] ^ :2tmp-cnd_sub_n.s: :error: 134invalid instruction mnemonic 'bic': 6 bic x7, x13, x0: error: invalid instruction mnemonic 'cset'^ ~Lrt: cset x0, cc~ ^~~tmp-cnd_add_n.s~: 131:2: error: invalid instruction mnemonic 'adcs' adcs x8, x10, x6 ^~~~ tmp-cnd_add_n.s:132:2: error: invalid instruction mnemonic 'adcs' adcs x9, x11, x7 ^~~~ tmp-cnd_add_n.s:133:14: error: brackets expression not supported on this target stp x8, x9, [x1,#16] ^ tmp-cnd_add_n.s:134:6: error: invalid instruction mnemonic 'cset' Lrt: cset x0, cs ^~~~ ```	2025-10-29 14:38:24 +05:00
Andrej730	77acbff50b	black .	2025-10-29 13:25:26 +05:00