Skip to content

Commit daf5046

Browse files
authored
Merge branch 'main' into workflow
2 parents f20cdd6 + 2f214bd commit daf5046

File tree

6 files changed

+27
-15
lines changed

6 files changed

+27
-15
lines changed

.github/workflows/deploy_docker.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
push:
55
branches:
66
- 'main'
7-
- 'workflow'
87

98
jobs:
109
docker:
@@ -36,14 +35,6 @@ jobs:
3635
file: ./Dockerfile
3736
push: true
3837
tags: ${{ secrets.DOCKERHUB_USERNAME }}/owl:main
39-
40-
- name: Build archlinux image
41-
uses: docker/build-push-action@v5
42-
with:
43-
context: .
44-
file: ./docker/Dockerfile.archlinux
45-
push: true
46-
tags: ${{ secrets.DOCKERHUB_USERNAME }}/owl:archlinux
4738

4839
- name: Build debian image
4940
uses: docker/build-push-action@v5
@@ -61,3 +52,11 @@ jobs:
6152
push: true
6253
tags: ${{ secrets.DOCKERHUB_USERNAME }}/owl:fedora
6354

55+
- name: Build archlinux image
56+
uses: docker/build-push-action@v5
57+
with:
58+
context: .
59+
file: ./docker/Dockerfile.archlinux
60+
push: true
61+
tags: ${{ secrets.DOCKERHUB_USERNAME }}/owl:archlinux
62+

CHANGES.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
## 1.2 (2024-12-24)
2+
3+
* Revise automatic installation test via GitHub Action
4+
* Revise dockerfiles; add docker automatic build and deployment
5+
* Fix compatibility on MacOS and Arm64 architecture
6+
* Update compilation to OCaml 5.2.0
7+
* Revise examples and tests
8+
* Update inline document and tutorials
9+
* FFT module revamp (@gabyfle)
10+
* Changed def of ssqr_diff' to not modify inputs (@patrick-nicodemus)
11+
* Avoid calling log(0) when generating gaussian random variables (@edwintorok)
12+
113
## 1.1 (2023-020-15)
214

315
* remove several components in owl: `aeos`, `plplot`, `zoo`

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ We encourage anyone who would like to build up their own tools based on Owl to c
3636

3737
## Owl Code Structure
3838

39+
3940
To help potential developers to understand the structure of Owl, here we briefly describe its overall design. More detailed description can be found in the [documentation](https://ocaml.xyz/docs/) and the Owl [books](https://ocaml.xyz/).
4041

4142
![Owl architecture 1](examples/owl-structure1.svg)

owl-base.opam

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ doc: "https://owlbarn.github.io/"
99
synopsis: "OCaml Scientific and Engineering Computing - Base"
1010
description: "Owl is an OCaml scientific library."
1111
build: [
12-
[ "dune" "subst" ] {pinned}
12+
[ "dune" "subst" ] {dev}
1313
[ "dune" "build" "-p" name "-j" jobs ]
1414
]
1515

1616
depends: [
1717
"ocaml" {>= "4.12.0"}
1818
"base-bigarray"
19-
"dune" {>= "2.0.0"}
19+
"dune" {>= "3.16"}
2020
]

owl-top.opam

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ synopsis: "OCaml Scientific and Engineering Computing - Top"
1010
description: "Owl is an OCaml scientific library."
1111

1212
build: [
13-
[ "dune" "subst" ] {pinned}
13+
[ "dune" "subst" ] {dev}
1414
[ "dune" "build" "-p" name "-j" jobs ]
1515
]
1616

1717
depends: [
1818
"ocaml" {>= "4.12.0"}
19-
"dune" {>= "2.0.0"}
19+
"dune" {>= "3.16"}
2020
"ocaml-compiler-libs"
2121
"owl" {= version}
2222
]

owl.opam

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Recently, Owl has implemented algorithmic differentiation which essentially make
1616
"""
1717

1818
build: [
19-
[ "dune" "subst" ] {pinned}
19+
[ "dune" "subst" ] {dev}
2020
[ "dune" "build" "-p" name "-j" jobs ]
2121
[ "dune" "runtest" "-p" name "-j" jobs ] {with-test}
2222
]
@@ -28,7 +28,7 @@ depends: [
2828
"base-bigarray"
2929
"conf-openblas" {>= "0.2.1"}
3030
"ctypes" {>= "0.16.0"}
31-
"dune" {>= "2.0.0"}
31+
"dune" {>= "3.16"}
3232
"dune-configurator"
3333
"owl-base" {= version}
3434
"npy"

0 commit comments

Comments
 (0)