Skip to content

Commit ffc159c

Browse files
authored
Merge pull request #31 from JuliaMath/GH_Actions
Moved CI to GitHub Actions
2 parents 92fe753 + 218d59a commit ffc159c

File tree

8 files changed

+141
-132
lines changed

8 files changed

+141
-132
lines changed

.github/workflows/main.yml

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
name: julia 1.0/1.3
2+
on:
3+
push:
4+
branches:
5+
- master
6+
pull_request:
7+
8+
jobs:
9+
testMKLjl:
10+
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }}
11+
runs-on: ${{ matrix.os }}
12+
strategy:
13+
fail-fast: false
14+
matrix:
15+
version:
16+
- '1.0'
17+
- '1.3'
18+
os:
19+
- ubuntu-latest
20+
- macOS-latest
21+
# - windows-latest
22+
arch:
23+
- x64
24+
steps:
25+
- uses: actions/checkout@v2
26+
- uses: julia-actions/setup-julia@latest
27+
with:
28+
version: ${{ matrix.version }}
29+
arch: ${{ matrix.arch }}
30+
- run: julia --color=yes --project -e 'using Pkg; Pkg.add(PackageSpec(url=\"https://github.com/JuliaComputing/MKL.jl\")); Pkg.instantiate()'
31+
if: matrix.os == 'windows-latest'
32+
- run: julia --color=yes --project -e 'using Pkg; Pkg.add(PackageSpec(url="https://github.com/JuliaComputing/MKL.jl")); Pkg.instantiate()'
33+
if: matrix.os != 'windows-latest'
34+
- uses: julia-actions/julia-buildpkg@latest
35+
- uses: julia-actions/julia-runtest@latest
36+
37+
testAptMKL:
38+
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }}
39+
runs-on: ${{ matrix.os }}
40+
strategy:
41+
matrix:
42+
version:
43+
- '1.0'
44+
- '1.3'
45+
os:
46+
- ubuntu-latest
47+
arch:
48+
- x64
49+
env:
50+
LD_LIBRARY_PATH: /opt/intel/compilers_and_libraries_2019.4.243/linux/mkl/lib/intel64_lin/
51+
steps:
52+
- name: Install MKL via apt
53+
run: |
54+
curl https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2019.PUB > GPG-PUB-KEY-INTEL-SW-PRODUCTS-2019.PUB
55+
sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS-2019.PUB
56+
rm GPG-PUB-KEY-INTEL-SW-PRODUCTS-2019.PUB
57+
sudo sh -c 'echo deb https://apt.repos.intel.com/mkl all main > /etc/apt/sources.list.d/intel-mkl.list'
58+
sudo apt-get update
59+
sudo apt-get install -y intel-mkl-64bit-2019.4-070
60+
- uses: actions/checkout@v2
61+
- uses: julia-actions/setup-julia@latest
62+
with:
63+
version: ${{ matrix.version }}
64+
arch: ${{ matrix.arch }}
65+
- uses: julia-actions/julia-buildpkg@latest
66+
- uses: julia-actions/julia-runtest@latest

.github/workflows/nightly.yml

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
name: julia nightly
2+
on:
3+
push:
4+
branches:
5+
- master
6+
pull_request:
7+
schedule:
8+
- cron: '1 0 1,15 * *'
9+
10+
jobs:
11+
testMKLjl:
12+
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }}
13+
runs-on: ${{ matrix.os }}
14+
strategy:
15+
fail-fast: false
16+
matrix:
17+
version:
18+
- 'nightly'
19+
os:
20+
- ubuntu-latest
21+
- macOS-latest
22+
# - windows-latest
23+
arch:
24+
- x64
25+
steps:
26+
- uses: actions/checkout@v2
27+
- uses: julia-actions/setup-julia@latest
28+
with:
29+
version: ${{ matrix.version }}
30+
arch: ${{ matrix.arch }}
31+
- run: julia --color=yes --project -e 'using Pkg; Pkg.add(PackageSpec(url=\"https://github.com/JuliaComputing/MKL.jl\")); Pkg.instantiate()'
32+
if: matrix.os == 'windows-latest'
33+
- run: julia --color=yes --project -e 'using Pkg; Pkg.add(PackageSpec(url="https://github.com/JuliaComputing/MKL.jl")); Pkg.instantiate()'
34+
if: matrix.os != 'windows-latest'
35+
- uses: julia-actions/julia-buildpkg@latest
36+
- uses: julia-actions/julia-runtest@latest
37+
38+
testAptMKL:
39+
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }}
40+
runs-on: ${{ matrix.os }}
41+
strategy:
42+
matrix:
43+
version:
44+
- 'nightly'
45+
os:
46+
- ubuntu-latest
47+
arch:
48+
- x64
49+
env:
50+
LD_LIBRARY_PATH: /opt/intel/compilers_and_libraries_2019.4.243/linux/mkl/lib/intel64_lin/
51+
steps:
52+
- name: Install MKL via apt
53+
run: |
54+
curl https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2019.PUB > GPG-PUB-KEY-INTEL-SW-PRODUCTS-2019.PUB
55+
sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS-2019.PUB
56+
rm GPG-PUB-KEY-INTEL-SW-PRODUCTS-2019.PUB
57+
sudo sh -c 'echo deb https://apt.repos.intel.com/mkl all main > /etc/apt/sources.list.d/intel-mkl.list'
58+
sudo apt-get update
59+
sudo apt-get install -y intel-mkl-64bit-2019.4-070
60+
source /opt/intel/mkl/bin/mklvars.sh intel64
61+
- uses: actions/checkout@v2
62+
- uses: julia-actions/setup-julia@latest
63+
with:
64+
version: ${{ matrix.version }}
65+
arch: ${{ matrix.arch }}
66+
- uses: julia-actions/julia-buildpkg@latest
67+
- uses: julia-actions/julia-runtest@latest

.travis.yml

Lines changed: 0 additions & 29 deletions
This file was deleted.

Project.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ SpecialFunctions = "0.8"
1414

1515
[extras]
1616
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
17-
MKL = "33e6dc65-8f57-5167-99aa-e5a354878fb2"
1817

1918
[targets]
20-
test = ["Test", "MKL"]
19+
test = ["Test"]

README.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# IntelVectorMath.jl (formerly VML.jl)
2-
[![Build Status](https://travis-ci.com/JuliaMath/IntelVectorMath.jl.svg?branch=master)](https://travis-ci.com/JuliaMath/IntelVectorMath.jl)
3-
[![Build status](https://ci.appveyor.com/api/projects/status/btdduqfsxux8fhsr?svg=true)](https://ci.appveyor.com/project/Crown421/IntelVectorMath-jl)
2+
![](https://github.com/JuliaMath/VML.jl/workflows/julia%201.0/1.3/badge.svg)
3+
![](https://github.com/JuliaMath/VML.jl/workflows/julia%20nightly/badge.svg)
44

55
This package provides bindings to the Intel MKL [Vector Mathematics Functions](https://software.intel.com/en-us/node/521751).
66
This is often substantially faster than broadcasting Julia's built-in functions, especially when applying a transcendental function over a large array.
@@ -165,14 +165,16 @@ Next steps for this package
165165
* [x] Avoiding overloading base and optional overload function
166166
* [x] Travis and AppVeyor testing
167167
* [x] Adding CIS function
168-
* [ ] Updating Benchmarks
168+
* [x] Move Testing to GitHub Actions
169+
* [x] Add test for using standalone MKL
170+
* [ ] Update Benchmarks
169171
* [ ] Add tests for mutating functions
170-
* [ ] Add test for using standalone MKL
172+
171173

172174

173175
## Advanced
174176
IntelVectorMath.jl works via Libdl which loads the relevant shared libraries. Libdl automatically finds the relevant libraries if the location of the binaries has been added to the system search paths.
175-
This already taken care of if you use MKL.jl, but the stand-alone may require you to source `mklvars.sh`. The default command on Mac and Ubuntu is `source /opt/intel/mkl/bin/mklvars.sh intel64`. You may want to add this to your `.bashrc`.
177+
This already taken care of if you use MKL.jl, but the stand-alone may require you to source `mklvars.sh` in the shell you are opening the REPL in. The default command on Mac and Ubuntu is `source /opt/intel/mkl/bin/mklvars.sh intel64`. You may want to add this to your `.bashrc`.
176178
Adding a new `*.conf` file in `/etc/ld.so.conf.d` also works, as the `intel-mkl-slim` package in the AUR does automatically.
177179

178180
Further, IntelVectorMath.jl uses [CpuId.jl](https://github.com/m-j-w/CpuId.jl) to detect if your processor supports the newer `avx2` instructions, and if not defaults to `libmkl_vml_avx`. If your system does not have AVX this package will currently not work for you.

appveyor.yml

Lines changed: 0 additions & 45 deletions
This file was deleted.

test/Manifest.toml

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,6 @@ git-tree-sha1 = "5b08ed6036d9d3f0ee6369410b830f8873d4024c"
1515
uuid = "b99e7846-7c00-51b0-8f62-c81ae34c0232"
1616
version = "0.5.8"
1717

18-
[[BufferedStreams]]
19-
deps = ["Compat", "Test"]
20-
git-tree-sha1 = "5d55b9486590fdda5905c275bb21ce1f0754020f"
21-
uuid = "e1450e63-4bb3-523b-b2a4-4ffa8c0fd77d"
22-
version = "1.0.0"
23-
2418
[[Compat]]
2519
deps = ["Base64", "Dates", "DelimitedFiles", "Distributed", "InteractiveUtils", "LibGit2", "Libdl", "LinearAlgebra", "Markdown", "Mmap", "Pkg", "Printf", "REPL", "Random", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "Test", "UUIDs", "Unicode"]
2620
git-tree-sha1 = "ed2c4abadf84c53d9e58510b5fc48912c2336fbb"
@@ -45,68 +39,30 @@ uuid = "8bb1440f-4735-579b-a4ab-409b98df4dab"
4539
deps = ["Random", "Serialization", "Sockets"]
4640
uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"
4741

48-
[[HTTPClient]]
49-
deps = ["Compat", "LibCURL"]
50-
git-tree-sha1 = "161d5776ae8e585ac0b8c20fb81f17ab755b3671"
51-
uuid = "0862f596-cf2d-50af-8ef4-f2be67dfa83f"
52-
version = "0.2.1"
53-
5442
[[InteractiveUtils]]
5543
deps = ["Markdown"]
5644
uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
5745

58-
[[LibCURL]]
59-
deps = ["BinaryProvider", "Libdl"]
60-
git-tree-sha1 = "fd5fc15f2a04608fe1435a769dbbfc7959ff1daa"
61-
uuid = "b27032c2-a3e7-50c8-80cd-2d36dbcbfd21"
62-
version = "0.5.2"
63-
64-
[[LibExpat]]
65-
deps = ["Compat"]
66-
git-tree-sha1 = "fde352ec13479e2f90e57939da2440fb78c5e388"
67-
uuid = "522f3ed2-3f36-55e3-b6df-e94fee9b0c07"
68-
version = "0.5.0"
69-
7046
[[LibGit2]]
7147
uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"
7248

7349
[[Libdl]]
7450
uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
7551

76-
[[Libz]]
77-
deps = ["BufferedStreams", "Random", "Test"]
78-
git-tree-sha1 = "d405194ffc0293c3519d4f7251ce51baac9cc871"
79-
uuid = "2ec943e9-cfe8-584d-b93d-64dcb6d567b7"
80-
version = "1.0.0"
81-
8252
[[LinearAlgebra]]
8353
deps = ["Libdl"]
8454
uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
8555

8656
[[Logging]]
8757
uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
8858

89-
[[MKL]]
90-
deps = ["BinaryProvider", "Libdl", "LinearAlgebra", "PackageCompiler", "Test"]
91-
git-tree-sha1 = "22e1063dfa595b24956d7b364c33a4f45e70e247"
92-
repo-rev = "master"
93-
repo-url = "https://github.com/JuliaComputing/MKL.jl.git"
94-
uuid = "33e6dc65-8f57-5167-99aa-e5a354878fb2"
95-
version = "0.0.0"
96-
9759
[[Markdown]]
9860
deps = ["Base64"]
9961
uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
10062

10163
[[Mmap]]
10264
uuid = "a63ad114-7e13-5084-954f-fe012c677804"
10365

104-
[[PackageCompiler]]
105-
deps = ["Libdl", "Pkg", "REPL", "Serialization", "UUIDs", "WinRPM"]
106-
git-tree-sha1 = "0b5dccd6520dd7072d1d2a7fb22501a98f42e691"
107-
uuid = "9b87118b-4619-50d2-8e1e-99f35a4d4d9d"
108-
version = "0.6.4"
109-
11066
[[Pkg]]
11167
deps = ["Dates", "LibGit2", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"]
11268
uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
@@ -166,9 +122,3 @@ uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
166122

167123
[[Unicode]]
168124
uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
169-
170-
[[WinRPM]]
171-
deps = ["BinDeps", "Compat", "HTTPClient", "LibExpat", "Libdl", "Libz", "URIParser"]
172-
git-tree-sha1 = "2a889d320f3b77d17c037f295859fe570133cfbf"
173-
uuid = "c17dfb99-b4f7-5aad-8812-456da1ad7187"
174-
version = "0.4.2"

test/Project.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
[deps]
22
CpuId = "adafc99b-e345-5852-983c-f28acb93d879"
33
Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
4-
MKL = "33e6dc65-8f57-5167-99aa-e5a354878fb2"
54
SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
65
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

0 commit comments

Comments
 (0)