Merge pull request #244 from JuliaParallel/jps/fix-clocks-macos

Temp. fix for clocks on non-Linux

Author: jpsamaroo

Diff for: .ci/test.jl

@@ -0,0 +1,10 @@
+import Pkg
+
+Pkg.update()
+
+root_directory = dirname(@__DIR__)
+
+bpfnative = Pkg.PackageSpec(path = root_directory)
+Pkg.develop(bpfnative)
+Pkg.precompile()
+Pkg.test("Dagger")

Diff for: .github/workflows/ci-julia-1.6-nightly.yml

@@ -0,0 +1,46 @@
+name: CI (Julia 1.6-nightly)
+on:
+  push:
+    branches:
+      - master
+    tags: '*'
+  pull_request:
+defaults:
+  run:
+    shell: bash
+jobs:
+  CI-julia-1-6-nightly:
+    name: CI-julia-1-6-nightly
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        version:
+          - '1.6-nightly'
+        os:
+          - ubuntu-latest
+          - macOS-latest
+          #- windows-latest
+        arch:
+          - x64
+    steps:
+      - uses: actions/checkout@v2
+      - uses: julia-actions/setup-julia@v1
+        with:
+          version: ${{ matrix.version }}
+          arch: ${{ matrix.arch }}
+      - uses: actions/cache@v1
+        env:
+          cache-name: cache-artifacts
+        with:
+          path: ~/.julia/artifacts
+          key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
+          restore-keys: |
+            ${{ runner.os }}-test-${{ env.cache-name }}-
+            ${{ runner.os }}-test-
+            ${{ runner.os }}-
+      - run: julia .ci/test.jl
+      - uses: julia-actions/julia-processcoverage@v1
+      - uses: codecov/codecov-action@v1
+        with:
+          file: lcov.info

Diff for: Project.toml

@@ -1,6 +1,6 @@
 name = "Dagger"
 uuid = "d58978e5-989f-55fb-8d15-ea34adc7bf54"
-version = "0.11.7"
+version = "0.11.8"
 
 [deps]
 Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"

Diff for: src/sch/Sch.jl

@@ -9,12 +9,7 @@ import ..Dagger: Context, Processor, Thunk, ThunkFuture, ThunkFailedException, C
 const OneToMany = Dict{Thunk, Set{Thunk}}
 
 include("util.jl")
-if Sys.isunix()
-    include("unix.jl")
-else
-    # FIXME
-    cputhreadtime() = time_ns()
-end
+include("clocks.jl")
 include("fault-handler.jl")
 include("dynamic.jl")
 

Diff for: src/sch/unix.jl renamed to src/sch/clocks.jl

@@ -28,10 +28,8 @@ elseif Sys.isapple() # Version 10.12 required
     const CLOCK_MONOTONIC          = Cint(6)
     const CLOCK_PROCESS_CPUTIME_ID = Cint(12)
 else
-    error("""
-          BenchmarkTools doesn't currently support your operating system.
-          Please file an issue, your kernel is $(Sys.KERNEL)
-          """)
+    @inline cputhreadtime() = time_ns()
+    return
 end
 
 @inline function clock_gettime(cid)
@@ -48,9 +46,13 @@ end
     maketime(clock_gettime(CLOCK_PROCESS_CPUTIME_ID))
 end
 
+@static if Sys.islinux()
 @inline function cputhreadtime()
     maketime(clock_gettime(CLOCK_THREAD_CPUTIME_ID))
 end
+else
+@inline cputhreadtime() = time_ns()
+end
 
 struct Measurement
     realtime::TimeSpec