Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adapt to https://github.com/coq-community/coqeal/pull/99 #30

Merged
merged 2 commits into from
Jan 25, 2025
Merged

Adapt to https://github.com/coq-community/coqeal/pull/99 #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
529a4ad
Adapt to https://github.com/coq-community/coqeal/pull/99
proux01 Jan 25, 2025
f4966f3
Update dependencies
proux01 Jan 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 4 additions & 11 deletions .github/workflows/docker-action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,13 @@ jobs:
strategy:
matrix:
image:
- 'mathcomp/mathcomp:2.1.0-coq-8.16'
- 'mathcomp/mathcomp:2.1.0-coq-8.17'
- 'mathcomp/mathcomp:2.1.0-coq-8.18'
- 'mathcomp/mathcomp:2.2.0-coq-8.16'
- 'mathcomp/mathcomp:2.2.0-coq-8.17'
- 'mathcomp/mathcomp:2.2.0-coq-8.18'
- 'mathcomp/mathcomp:2.2.0-coq-8.19'
- 'mathcomp/mathcomp:2.2.0-coq-dev'
- 'mathcomp/mathcomp-dev:coq-8.18'
- 'mathcomp/mathcomp-dev:coq-8.19'
- 'mathcomp/mathcomp:2.3.0-coq-8.20'
- 'mathcomp/mathcomp:2.3.0-coq-dev'
- 'mathcomp/mathcomp-dev:coq-8.20'
- 'mathcomp/mathcomp-dev:coq-dev'
fail-fast: false
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: coq-community/docker-coq-action@v1
with:
opam_file: 'coq-mathcomp-apery.opam'
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ remains the sole trusted code base.
- [MathComp ssreflect 2.1 or later](https://math-comp.github.io)
- [MathComp algebra](https://math-comp.github.io)
- [MathComp field](https://math-comp.github.io)
- [CoqEAL 2.0.0 or later](https://github.com/coq-community/coqeal)
- [CoqEAL 2.0.4 or later](https://github.com/coq-community/coqeal)
- [MathComp real closed fields 2.0.0 or later](https://github.com/math-comp/real-closed)
- [MathComp bigenough 1.0.1 or later](https://github.com/math-comp/bigenough)
- [Mczify](https://github.com/math-comp/mczify) 1.5.0 or later
Expand Down
4 changes: 2 additions & 2 deletions coq-mathcomp-apery.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ build: [make "-j%{jobs}%"]
install: [make "install"]
depends: [
"coq" {(>= "8.16" & < "8.20~") | (= "dev")}
"coq-mathcomp-ssreflect" {(>= "2.1" & < "2.3~") | (= "dev")}
"coq-mathcomp-ssreflect" {(>= "2.3" & < "2.4~") | (= "dev")}
"coq-mathcomp-algebra"
"coq-mathcomp-field"
"coq-coqeal" {>= "2.0.0"}
"coq-coqeal" {>= "2.0.4"}
"coq-mathcomp-real-closed" {>= "2.0.0"}
"coq-mathcomp-bigenough" {>= "1.0.1"}
"coq-mathcomp-zify" {>= "1.5.0"}
Expand Down
26 changes: 6 additions & 20 deletions meta.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,33 +55,19 @@ supported_coq_versions:
opam: '{(>= "8.16" & < "8.20~") | (= "dev")}'

tested_coq_opam_versions:
- version: '2.1.0-coq-8.16'
- version: '2.3.0-coq-8.20'
repo: 'mathcomp/mathcomp'
- version: '2.1.0-coq-8.17'
- version: '2.3.0-coq-dev'
repo: 'mathcomp/mathcomp'
- version: '2.1.0-coq-8.18'
repo: 'mathcomp/mathcomp'
- version: '2.2.0-coq-8.16'
repo: 'mathcomp/mathcomp'
- version: '2.2.0-coq-8.17'
repo: 'mathcomp/mathcomp'
- version: '2.2.0-coq-8.18'
repo: 'mathcomp/mathcomp'
- version: '2.2.0-coq-8.19'
repo: 'mathcomp/mathcomp'
- version: '2.2.0-coq-dev'
repo: 'mathcomp/mathcomp'
- version: 'coq-8.18'
repo: 'mathcomp/mathcomp-dev'
- version: 'coq-8.19'
- version: 'coq-8.20'
repo: 'mathcomp/mathcomp-dev'
- version: 'coq-dev'
repo: 'mathcomp/mathcomp-dev'

dependencies:
- opam:
name: coq-mathcomp-ssreflect
version: '{(>= "2.1" & < "2.3~") | (= "dev")}'
version: '{(>= "2.3" & < "2.4~") | (= "dev")}'
description: |-
[MathComp ssreflect 2.1 or later](https://math-comp.github.io)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
[MathComp ssreflect 2.1 or later](https://math-comp.github.io)
[MathComp ssreflect 2.3 or later](https://math-comp.github.io)

- opam:
Expand All @@ -94,9 +80,9 @@ dependencies:
[MathComp field](https://math-comp.github.io)
- opam:
name: coq-coqeal
version: '{>= "2.0.0"}'
version: '{>= "2.0.4"}'
description: |-
[CoqEAL 2.0.0 or later](https://github.com/coq-community/coqeal)
[CoqEAL 2.0.4 or later](https://github.com/coq-community/coqeal)
- opam:
name: coq-mathcomp-real-closed
version: '{>= "2.0.0"}'
Expand Down
25 changes: 18 additions & 7 deletions theories/rho_computations.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,16 +196,23 @@ Context (RexpAQ : refines (RAQ ==> Logic.eq ==> RAQ)%rel (@GRing.exp _) exp_op).
Context (RZtoAQ : refines (Logic.eq ==> RAQ)%rel rat_of_Z cast).
Context (Rnat_to_AQ : refines (Logic.eq ==> RAQ)%rel natr cast).

Parametricity positive.
Parametricity Z.
Parametricity generic_beta.
Parametricity generic_alpha.
Parametricity generic_h.
Parametricity generic_h_iter.
Elpi derive.param2 positive.
Elpi derive.param2 Z.
Elpi derive.param2 generic_beta.
Elpi derive.param2 generic_alpha.
Elpi derive.param2 generic_h.
Elpi derive.param2 generic_h_iter.

Global Instance refines_bool_eq x y : refines Z_R x y -> refines eq x y.
Proof. by rewrite !refinesE; case => // p q; elim => // ? ? _ [->]. Qed.

Global Instance refines_expAQ :
refines (exp_of_R RAQ nat_R) (GRing.exp (R:=rat)) expAQ.
Proof. by rewrite /exp_of_R refinesE => *; apply: refinesP. Qed.

Global Instance refines_ZtoAQ : refines (cast_of_R Z_R RAQ) rat_of_Z ZtoAQ.
Proof. by rewrite /cast_of_R refinesE => *; apply: refinesP. Qed.

Global Instance refines_beta :
refines (RAQ ==> RAQ)%rel beta (generic_beta _ _ _ _).
Proof. by param generic_beta_R. Qed.
Expand All @@ -218,9 +225,13 @@ Global Instance refines_h :
refines (RAQ ==> RAQ ==> RAQ)%rel h (generic_h _ _ _ _ _ _).
Proof. by param generic_h_R. Qed.

Global Instance refines_nat_to_AQ :
refines (cast_of_R nat_R RAQ) natr nat_to_AQ.
Proof. by rewrite /cast_of_R refinesE => *; apply: refinesP. Qed.

Global Instance refines_h_iter n :
refines (RAQ)%rel (h_iter n) (generic_h_iter _ _ _ _ _ _ _ _ n).
Proof. by param generic_h_iter_R; rewrite refinesE; elim: n => //= *; constructor. Qed.
Proof. by param generic_h_iter_R; rewrite refinesE; apply: nat_Rxx. Qed.

End parametric.

Expand Down
Loading