Skip to content

Commit

Permalink
try getting around pyop2 requiring tsfc
Browse files Browse the repository at this point in the history
  • Loading branch information
@tj-sun
tj-sun committed Aug 21, 2018
1 parent 874ab43 commit 9f5c626
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
2 changes: 1 addition & 1 deletion Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ pipeline {
sh 'mkdir tmp'
dir('tmp') {
timestamps {
sh '../scripts/firedrake-install --package-branch firedrake tsfc2loopy --package-branch tsfc tsfc2loopy --package-branch PyOP2 tsfc_loopying --package-branch loopy opaque-type --disable-ssh --minimal-petsc ${SLEPC} --slope --install thetis --install gusto --install icepack --install pyadjoint ${PACKAGE_MANAGER} || (cat firedrake-install.log && /bin/false)'
sh '../scripts/firedrake-install --package-branch firedrake tsfc2loopy --package-branch PyOP2 tsfc_loopying --disable-ssh --minimal-petsc ${SLEPC} --slope --install thetis --install gusto --install icepack --install pyadjoint ${PACKAGE_MANAGER} || (cat firedrake-install.log && /bin/false)'
}
}
}
Expand Down
1 change: 0 additions & 1 deletion requirements-git.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
git+https://github.com/firedrakeproject/ufl.git#egg=ufl
git+https://github.com/firedrakeproject/fiat.git#egg=fiat
git+https://github.com/FInAT/FInAT.git#egg=finat
git+https://github.com/firedrakeproject/tsfc.git#egg=tsfc
git+https://github.com/OP2/PyOP2.git#egg=pyop2

4 comments on commit 9f5c626

@miklos1
Copy link
Member

Choose a reason for hiding this comment

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

This is the Firedrake branch. Firedrake will still require TSFC, I suppose...

@tj-sun
Copy link
Contributor Author

@tj-sun tj-sun commented on 9f5c626 Aug 21, 2018

Choose a reason for hiding this comment

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

Yes, here I'm trying to install tsfc from pyop2, as pyop2 depends on tsfc (we might change that later), but otherwise I'm getting "directory already exists" for tsfc when installing firedrake. Maybe the package-branch has something to do with it, I'm not sure, but now at least I can get both firedrake Jenkins and pyop2 Travis to run.

@miklos1
Copy link
Member

Choose a reason for hiding this comment

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

Okay.

pyop2 depends on tsfc (we might change that later)

Yes, you probably should change this...

@tj-sun
Copy link
Contributor Author

@tj-sun tj-sun commented on 9f5c626 Aug 21, 2018

Choose a reason for hiding this comment

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

Agreed, we might want to strip out some gem functionality into a different package, or just copy several files. Will see what you guys think.

Please sign in to comment.