Skip to content

Commit

Permalink
transition to submodule for eigen instead of system
Browse files Browse the repository at this point in the history
  • Loading branch information
ixchow committed Oct 28, 2023
1 parent 5d0b444 commit ef88eac
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 13 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/build-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ jobs:
run: |
dir/w
#call "C:\Program Files (x86)\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
git clone https://github.com/eigenteam/eigen-git-mirror eigen
node Maekfile.js -q
- name: Upload Artifact
uses: actions/upload-artifact@v2
Expand Down Expand Up @@ -74,7 +73,7 @@ jobs:
shell: bash
run: |
sudo apt-get update
sudo apt-get install libgl-dev libasound2-dev libeigen3-dev
sudo apt-get install libgl-dev libasound2-dev
ls
node Maekfile.js -q
- name: Upload Artifact
Expand Down Expand Up @@ -114,7 +113,6 @@ jobs:
cd ..
wget https://github.com/15-466/nest-libs/releases/download/${NEST_LIBS_VERSION}/nest-libs-macos-${NEST_LIBS_VERSION}.tar.gz -Onest-libs.tar.gz
tar xfz nest-libs.tar.gz
brew install eigen
- name: Build Code
shell: bash
run: |
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
objs
dist/schedule
dist/
eigen/
kit-libs-win/
kit-libs-linux/
maek-cache.json
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[submodule "kit"]
path = kit
url = git@github.com:ixchow/kit
[submodule "eigen"]
path = eigen
url = https://github.com/eigenteam/eigen-git-mirror
4 changes: 2 additions & 2 deletions Maekfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -153,13 +153,13 @@ const schedule_names = [
//extra flags for finding Eigen:
const interpolate_values_CPPFlags = [...maek.options.CPPFlags];
if (maek.OS === "macos") {
interpolate_values_CPPFlags.push('-I/opt/homebrew/include/eigen3', '-Wno-unused-but-set-variable');
interpolate_values_CPPFlags.push('-Ieigen', '-Wno-unused-but-set-variable');
} else if (maek.OS === "windows") {
interpolate_values_CPPFlags.push('/Ieigen', '/D_SILENCE_CXX17_RESULT_OF_DEPRECATION_WARNING',
`/wd4459` //local definition hides global
);
} else {
interpolate_values_CPPFlags.push('-I/usr/include/eigen3');
interpolate_values_CPPFlags.push('-Ieigen');
}

const link_names = [
Expand Down
11 changes: 4 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ Building autoknit is handled with the single-file build tool [maek](https://gith

### <a name="mac"></a>MacOS setup
```
#install eigen library and nodejs (used for build script and to post-process scheduled output):
brew install eigen node
#install nodejs (used for build script and to post-process scheduled output):
brew install node
#extract nest-libs package as a sibling of autoknit folder:
curl 'https://github.com/15-466/nest-libs/releases/download/v0.13/nest-libs-macos-v0.13.tar.gz' -L -O
Expand All @@ -37,8 +37,8 @@ git submodule update
### <a name="linux"></a>Linux setup

```
#install eigen library and nodejs (used for build script and to post-process scheduled output):
sudo apt-get install libeigen3-dev nodejs
#install nodejs (used for build script and to post-process scheduled output):
sudo apt-get install nodejs
#extract nest-libs package as a sibling of autoknit folder:
curl 'https://github.com/15-466/nest-libs/releases/download/v0.13/nest-libs-linux-v0.13.tar.gz' -L -O
Expand All @@ -57,9 +57,6 @@ First, make sure that git is installed in such a way that it can be run from a c

Then, from a `Visual Studio 2022 > x64 Native Tools Command Prompt for VS 2022` command prompt do:
```
#get a local copy of the eigen library:
git clone git@github.com:eigenteam/eigen-git-mirror eigen
#clone repository:
git clone git@github.com:textiles-lab/autoknit
cd autoknit
Expand Down
1 change: 1 addition & 0 deletions eigen
Submodule eigen added at 36b959

0 comments on commit ef88eac

Please sign in to comment.