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.

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

Remove examples directory and improvement documentation #47

Merged
merged 4 commits into from
Sep 11, 2020

Conversation

kamilrakoczy
Copy link
Contributor

Fixes #25
Supersede of #39

CI will fail, as tests are downloading master version, not version from this PR.

This pull request:

  • Removes the extra examples directory.
  • Makes the layout of the eos-s3 and xc7 directories consistent.
  • Moves the setup instructions + build instructions under the relevant locations.
  • Makes the setup instructions for eos-s3 and xc7 consistent (install conda then create an environment using the correct environment.yml file).
  • Sections for the eos-s3 and xc7 are links to the README sections in each directory. It is not possible to automatically generate content from another README.md file (see: https://stackoverflow.com/questions/35080160/github-include-md-files-in-readme-md).

mithro and others added 3 commits July 29, 2020 12:26
Signed-off-by: Tim 'mithro' Ansell <me@mith.ro>
Signed-off-by: Tim 'mithro' Ansell <me@mith.ro>
Signed-off-by: Kamil Rakoczy <krakoczy@antmicro.com>
@mithro
Copy link
Contributor

mithro commented Sep 7, 2020

CI will fail, as tests are downloading master version, not version from this PR.

Can you log a github issue about this?

@mithro
Copy link
Contributor

mithro commented Sep 7, 2020

See the solution we use in skywater-pdk -> https://github.com/google/skywater-pdk

Stack Overflow
Is there a way in Github to include md files in for example the README.md?

Headline

Text

include
It should not link to the file, it should load the contents

GitHub
Open source process design kit for usage with SkyWater Technology Foundry's 130nm node. - google/skywater-pdk

eos-s3/README.md Outdated
source "$INSTALL_DIR/conda/etc/profile.d/conda.sh"
conda env create -f eos-s3/environment.yml
conda activate eos-s3
wget -qO- https://quicklogic-my.sharepoint.com/:u:/p/kkumar/Eb7341Bq-XRAukVQ6oQ6PrgB-qdFbrsrPEON1yTa4krFSA?download=1 | tar -xJ -C $INSTALL_DIR
Copy link
Contributor

@mithro mithro Sep 7, 2020

Choose a reason for hiding this comment

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

These two steps highlight that the quicklogic install instructions are wrong. They should;

  • not be referencing sharepoint / kkumar,
  • not doing a copy.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This commands where copied directly from hidden installation script of quicklogic toolchain installator.

To not reference sharepoint / kkumar quicklogic archdef needs to be uploaded somewhere else. Probably this should be done by someone from QL.

Copy is fixing the problem with yosys not finding shared files. It is probably a bug in the quicklogic-yosys conda package. The same copy is done in the hidden installation script.
If we do not want to directly copy we need a fixed conda package or still use the official installation script.

Copy link
Contributor

Choose a reason for hiding this comment

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

This commands where copied directly from hidden installation script of quicklogic toolchain installator.

To not reference sharepoint / kkumar quicklogic archdef needs to be uploaded somewhere else. Probably this should be done by someone from QL.

This should be generated from CI automatically. Talk to @kgugala about who should own fixing this.

Copy is fixing the problem with yosys not finding shared files. It is probably a bug in the quicklogic-yosys conda package. The same copy is done in the hidden installation script.
If we do not want to directly copy we need a fixed conda package or still use the official installation script.

Please log bugs about these issues. Both the conda package and the official installation script probably need fixing.

xc7/README.md Outdated Show resolved Hide resolved
@kamilrakoczy
Copy link
Contributor Author

CI will fail, as tests are downloading master version, not version from this PR.

Can you log a github issue about this?

I created new issue: #48

This commit is workaround for Github not rendering
`.. include::`.

This PR adds:
 - Adds Makefile for creating conda environment under `env/conda` and
   installs `rst_include` tool.

 - Adds make README.rst target to generate `README.rst` from `README.src.rst`

 - Has Travis CI run on repository and check that the `README.rst` file
   has been rebuilt and committed if any of the dependencies have
   change.

Signed-off-by: Kamil Rakoczy <krakoczy@antmicro.com>
@mithro
Copy link
Contributor

mithro commented Sep 11, 2020

I'm going to merge this. There are a bunch of follow up items which need to be logged as issues and then cleaned up.

@mithro mithro merged commit ba08ae0 into chipsalliance:master Sep 11, 2020
@mgielda mgielda deleted the examples-remove branch November 26, 2020 18:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

The example directory seems useless?
2 participants