fix

timetag · Jun 25, 2024 · e12783c · e12783c
1 parent b994e29
commit e12783c
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 36 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -55,41 +55,41 @@ jobs:
         with:
           name: ETA_Install-win64
           path: artifact
-  # compile-m1:
-  #   runs-on: macos-latest
-  #   strategy:
-  #     matrix:
-  #       python-version: [3.9]
-  #   steps:
-  #     - uses: actions/checkout@v2
-  #     - name: Set up Python ${{ matrix.python-version }}
-  #       uses: actions/setup-python@v4
-  #       with:
-  #         python-version: ${{ matrix.python-version }}
-  #     - name: Install clang-12
-  #       run: |
-  #         brew install llvm@12
-  #     - name: Install dependencies and build
-  #       run: |
-  #         pip3 install virtualenv
-  #         virtualenv venv
-  #         source venv/bin/activate
-  #         ls
-  #         export PATH="/usr/local/opt/llvm@12/bin:$PATH"
-  #         export LDFLAGS="-L/opt/homebrew/opt/llvm@12/lib"
-  #         export CPPFLAGS="-I/opt/homebrew/opt/llvm@12/include"
-  #         export CXXFLAGS="-I/opt/homebrew/opt/llvm@12/include"
-  #         clang etabackend/cpp/PARSE_TimeTagFileHeader.cpp -D __linux__ -S -emit-llvm 
-  #         clang etabackend/cpp/PARSE_TimeTags.cpp -D __linux__ -S -emit-llvm 
-  #         clang etabackend/cpp/INFRA_vchn.cpp -D __linux__ -S -emit-llvm
-  #         mv *.ll etabackend/ll/m1
-  #         pip install -e ./
-  #         pytest
-  #     - name: Upload artifact
-  #       uses: actions/upload-artifact@v1
-  #       with:
-  #         name: ll-m1
-  #         path: etabackend/ll/m1
+  compile-m1:
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        python-version: [3.9]
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install clang-12
+        run: |
+          brew install llvm@12
+      - name: Install dependencies and build
+        run: |
+          pip3 install virtualenv
+          virtualenv venv
+          source venv/bin/activate
+          ls
+          export PATH="/usr/local/opt/llvm@12/bin:$PATH"
+          export LDFLAGS="-L/opt/homebrew/opt/llvm@12/lib"
+          export CPPFLAGS="-I/opt/homebrew/opt/llvm@12/include"
+          export CXXFLAGS="-I/opt/homebrew/opt/llvm@12/include"
+          clang etabackend/cpp/PARSE_TimeTagFileHeader.cpp  -S -emit-llvm 
+          clang etabackend/cpp/PARSE_TimeTags.cpp  -S -emit-llvm 
+          clang etabackend/cpp/INFRA_vchn.cpp  -S -emit-llvm
+          mv *.ll etabackend/ll/m1
+          pip install -e ./
+          pytest
+      - name: Upload artifact
+        uses: actions/upload-artifact@v1
+        with:
+          name: ll-m1
+          path: etabackend/ll/m1
   build:
     #needs: [compile-m1]
     runs-on: ubuntu-latest

diff --git a/etabackend/cpp/PARSE_TimeTagFileHeader.cpp b/etabackend/cpp/PARSE_TimeTagFileHeader.cpp
@@ -15,8 +15,12 @@ Zuzeng Lin, KTH, Nov 2017
 #ifdef __linux__
 /* Linux */
 #include <wchar.h>
-
 #endif
+#ifdef __APPLE__
+/* macOS */
+#include <wchar.h>
+#endif
+
 #include "stdlib.h"
 #include "stdio.h"
 #include "fcntl.h"