Merge branch 'main' into infra

Author: QuimMoya

.github/workflows/build.yml

@@ -13,11 +13,17 @@ jobs:
 
     strategy:
       matrix:
-        os-type: [ubuntu-20.04]
+        os-type: [ubuntu-latest]
         configuration: [Debug, Release, RelWithDebInfo]    
 
     steps:
     - uses: actions/checkout@v2
+    - name: Install
+      run: |
+        sudo apt update
+        sudo apt install gcc-13 g++-13
+        sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 100 --slave /usr/bin/g++ g++ /usr/bin/g++-13 --slave /usr/bin/gcov gcov /usr/bin/gcov-13
+        sudo update-alternatives --set gcc /usr/bin/gcc-13
     - name: Configure
       working-directory: ${{github.workspace}}/src/wasm
       run: cmake -B ${{github.workspace}}/src/wasm/Build -DCMAKE_BUILD_TYPE=${{matrix.configuration}}

.github/workflows/jest.yml

@@ -16,7 +16,7 @@ jobs:
     - uses: actions/checkout@v3
     - uses: mymindstorm/setup-emsdk@v11
       with:
-          version: 3.1.31
+          version: 3.1.44
     - name: Install modules
       run: npm i
     - name: Build

.github/workflows/publish.yml

@@ -17,7 +17,7 @@ jobs:
           node-version: 18
       - uses: mymindstorm/setup-emsdk@v11
         with:
-          version: 3.1.31
+          version: 3.1.44
       - run: npm install -g npm@latest
       - run: npm ci
       - run: npm run build-publish-repo

.github/workflows/upload.yml

@@ -18,7 +18,7 @@ jobs:
     steps:
       - uses: mymindstorm/setup-emsdk@v11
         with:
-          version: 3.1.31
+          version: 3.1.44
       - name: Checkout 🛎️
         uses: actions/checkout@v3
       - uses: actions/setup-node@v2

.gitignore

@@ -53,3 +53,4 @@ dist/*
 
 #Mac Temporary Files
 **/.DS_Store
+benchmark/ifcfiles/large.ifc.test

Dockerfile

@@ -1,4 +1,4 @@
-FROM emscripten/emsdk:3.1.31
+FROM emscripten/emsdk:3.1.44
 WORKDIR /web-ifc-app
 COPY package*.json .
 RUN npm i -g cpy-cli

README.md

@@ -72,7 +72,7 @@ These are the requirements needed to build web-ifc (only for those that wish to
 
 1. Node v16 or later
 2. NPM v7 or later
-3. EMSCRIPTEN v3.1.27 or later
+3. EMSCRIPTEN v3.1.44 or later
 4. CMAKE v3.18 or later
 
 ## Building WASM module

benchmark.md

@@ -1,9 +1,11 @@
 # System informations 
- {"gpu":"","cpuName":"Apple M1","freeRam":18.25390625,"totalRam":8192}
+ {"gpu":"","cpuName":"Apple M1","freeRam":85.890625,"totalRam":8192}
  _________ 
-| filename | Size (mo) | Time to open model (ms) | Time to execute all (ms) | Total ifc entities | Total meshes | Total geometries | total errors |
+| filename | Size (mb) | Time to open model (ms) | Time to execute all (ms) | Total ifc entities | Total meshes | Total geometries | total errors |
 |-------|-------|-------|-------|-------|-------|-------|-------|
-| ifcfiles/advanced_model.ifc.test | 33.67 | 428 | 2711 | 594374 | 6401 | 14120 | 0 |
- ifcfiles/dental_clinic.ifc.test | 12.4 | 243 | 1149 | 209259 | 2586 | 2626 | 176 |
- ifcfiles/example.ifc.test | 0.39 | 6 | 12 | 6487 | 115 | 119 | 0 |
- ifcfiles/tested_sample_project.ifc.test | 0.68 | 9 | 135 | 14119 | 93 | 98 | 0 |
+| ifcfiles/advanced_model.ifc.test | 33.67 | 279 | 2328 | 594374 | 6401 | 14120 | 0 |
+ ifcfiles/dental_clinic.ifc.test | 12.4 | 97 | 1128 | 209259 | 2586 | 2626 | 176 |
+ ifcfiles/example.ifc.test | 0.39 | 5 | 9 | 6487 | 115 | 119 | 0 |
+ ifcfiles/large.ifc.test | 251.25 | 1562 | 5605 | 2153923 | 8701 | 9875 | 182 |
+ ifcfiles/schependomlaan.ifc.test | 47 | 399 | 1045 | 714485 | 3569 | 3643 | 7296 |
+ ifcfiles/tested_sample_project.ifc.test | 0.68 | 6 | 115 | 14119 | 93 | 98 | 0 |

benchmark/benchmark.ts

@@ -88,6 +88,27 @@ class BenchmarkResultFormatter{
     }
 }
 
+async function StreamFileToString(filename: string) {
+    let stream = fs.createReadStream(filename);
+    return new Promise((resolve, reject) => {
+      const data:any = [];
+
+      stream.on('data', (chunk) => {
+        data.push(chunk);
+      });
+
+      stream.on('end', () => {
+        resolve(Buffer.concat(data))
+      })
+
+      stream.on('error', (err) => {
+        reject(err)
+      })
+
+      return data;
+    })
+}
+
 async function BenchmarkIfcFile(module: any, filename: string): Promise<FileResult>
 {
     let result = new FileResult();
@@ -97,7 +118,7 @@ async function BenchmarkIfcFile(module: any, filename: string): Promise<FileResu
     //let modelID = module.OpenModel("example.ifc", new Uint8Array(data.toString()));
 
     const ifcFilePath = path.join(__dirname, './'+filename);
-    const ifcFileContent = fs.readFileSync(ifcFilePath);
+    const ifcFileContent = await StreamFileToString(ifcFilePath);
 
     let startTime = ms();
     let modelID : number = module.OpenModel(ifcFileContent);
@@ -176,7 +197,7 @@ function generateMarkdownReport(systemInfo : SystemInfo, fileResult : Map<string
     let formatter = new BenchmarkResultFormatter();
     formatter.columns = {
         filename: "filename",
-        fileSize: "Size (mo)",
+        fileSize: "Size (mb)",
         timeTakenToOpenModel: "Time to open model (ms)",
         timeSuccess: "Time to execute all (ms)",
         numberOfIfcEntities: "Total ifc entities",