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

Fkm nonlinear #29

Closed
wants to merge 92 commits into from
Closed

Fkm nonlinear #29

wants to merge 92 commits into from

Conversation

maierbn
Copy link
Contributor

@maierbn maierbn commented Sep 5, 2023

No description provided.

src/pylife/mesh/gradient.py Outdated Show resolved Hide resolved
@maierbn
Copy link
Contributor Author

maierbn commented Sep 5, 2023

  • Document classes and/or modules with sphinx

@johannes-mueller johannes-mueller self-requested a review September 5, 2023 17:12
@maierbn
Copy link
Contributor Author

maierbn commented Sep 6, 2023

@johannes-mueller I cannot push to the fkm_nonlinear branch, do I have all required access rights?

Copy link
Member

@johannes-mueller johannes-mueller left a comment

Choose a reason for hiding this comment

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

Thanks @maierbn – this is a lot of good work.

While I see some room for improvement, we should merge it soon to release it as beta to get feedback from users. Then we can rework stuff in smaller steps.

Can you please go through my comments and look if you can apply them.

Thanks

demos/fkm_nonlinear/fkm_nonlinear_full.ipynb Outdated Show resolved Hide resolved
docs/demos/import_mesh_abaqus.nblink Outdated Show resolved Hide resolved
docs/tutorials/fkm_nonlinear.rst Outdated Show resolved Hide resolved
'''
return self._ramberg_osgood_relation

@K_p.setter
Copy link
Member

Choose a reason for hiding this comment

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

Do we really need the setters? I think it would be in general be a good thing to discourage modifying data structures as that can lead to side effects.

docs/materiallaws/notch_approximation_laws.rst Outdated Show resolved Hide resolved
src/pylife/stress/rainflow/recorders.py Outdated Show resolved Hide resolved
tests/materiallaws/test_notch_approximation_law.py Outdated Show resolved Hide resolved
tests/mesh/test_gradient.py Outdated Show resolved Hide resolved
tests/mesh/test_gradient.py Show resolved Hide resolved
tests/stress/rainflow/test_find_turns.py Outdated Show resolved Hide resolved
johannes-mueller and others added 25 commits October 13, 2023 18:27
Signed-off-by: Johannes Mueller <[email protected]>
Signed-off-by: Benjamin Maier <[email protected]>
Signed-off-by: Johannes Mueller <[email protected]>
Signed-off-by: Benjamin Maier <[email protected]>
Signed-off-by: Johannes Mueller <[email protected]>
Signed-off-by: Benjamin Maier <[email protected]>
Necessary to make the test books work

Signed-off-by: Johannes Mueller <[email protected]>
Signed-off-by: Benjamin Maier <[email protected]>
Signed-off-by: Johannes Mueller <[email protected]>
Signed-off-by: Benjamin Maier <[email protected]>
Signed-off-by: Johannes Mueller <[email protected]>
Signed-off-by: Benjamin Maier <[email protected]>
Signed-off-by: Johannes Mueller <[email protected]>
Signed-off-by: Benjamin Maier <[email protected]>
Signed-off-by: Benjamin Maier <[email protected]>
New pyvista versions do no longer tolerate it.

Signed-off-by: Johannes Mueller <[email protected]>
Signed-off-by: Benjamin Maier <[email protected]>
Signed-off-by: Johannes Mueller <[email protected]>
Signed-off-by: Benjamin Maier <[email protected]>
Signed-off-by: Johannes Mueller <[email protected]>
Signed-off-by: Benjamin Maier <[email protected]>
Signed-off-by: Johannes Mueller <[email protected]>
Signed-off-by: Benjamin Maier <[email protected]>
Signed-off-by: Johannes Mueller <[email protected]>
Signed-off-by: Johannes Mueller <[email protected]>
Signed-off-by: Benjamin Maier <[email protected]>
Signed-off-by: Johannes Mueller <[email protected]>
Signed-off-by: Benjamin Maier <[email protected]>
Signed-off-by: Johannes Mueller <[email protected]>
Signed-off-by: Benjamin Maier <[email protected]>
Need to handle some int type mismatches in tests more gracefully.

Signed-off-by: Johannes Mueller <[email protected]>
Signed-off-by: Benjamin Maier <[email protected]>
Signed-off-by: Johannes Mueller <[email protected]>
Signed-off-by: Benjamin Maier <[email protected]>
Signed-off-by: Johannes Mueller <[email protected]>
Signed-off-by: Benjamin Maier <[email protected]>
maierbn and others added 5 commits October 13, 2023 18:35
@maierbn
Copy link
Contributor Author

maierbn commented Oct 13, 2023

@johannes-mueller I addressed most of the comments and marked them as resolved. Some are not yet resolved, either where I would need your input again or where they contain an issue for after the merge.
I applied two suggestions directly in GitHub and I think they got committed without sign-off. Therefore I had to rebase, add the sign-offs and force push.

@maierbn
Copy link
Contributor Author

maierbn commented Nov 2, 2023

@johannes-mueller I fail to install it because of dependency problems:

pip install -e .[all]
Defaulting to user installation because normal site-packages is not writeable
Looking in indexes: https://anu9rng:****@rb-artifactory.bosch.com/artifactory/api/pypi/python-virtual/simple
Obtaining file:///home/mbe7rng/software/pylife
  Installing build dependencies ... done
  Checking if build backend supports build_editable ... done
  Getting requirements to build wheel ... done
  Preparing metadata (pyproject.toml) ... done
ERROR: Could not find a version that satisfies the requirement pandas!=2.1,>=1.4.0 (from pylife[all]) (from versions: 0.1, 0.2, 0.3.0, 0.4.0, 0.4.1, 0.4.2, 0.4.3, 0.5.0, 0.6.0, 0.6.1, 0.7.0, 0.7.1, 0.7.2, 0.7.3, 0.8.0, 0.8.1, 0.9.0, 0.9.1, 0.10.0, 0.10.1, 0.11.0, 0.12.0, 0.13.0, 0.13.1, 0.14.0, 0.14.1, 0.15.0, 0.15.1, 0.15.2, 0.16.0, 0.16.1, 0.16.2, 0.17.0, 0.17.1, 0.18.0, 0.18.1, 0.19.0, 0.19.1, 0.19.2, 0.20.0, 0.20.1, 0.20.2, 0.20.3, 0.21.0, 0.21.1, 0.22.0, 0.23.0, 0.23.1, 0.23.2, 0.23.3, 0.23.4, 0.24.0, 0.24.1, 0.24.2, 0.25.0, 0.25.1, 0.25.2, 0.25.3, 1.0.0, 1.0.1, 1.0.2, 1.0.3, 1.0.4, 1.0.5, 1.1.0, 1.1.1, 1.1.2, 1.1.3, 1.1.4, 1.1.5)
ERROR: No matching distribution found for pandas!=2.1,>=1.4.0

Is the spec. of numpy==1.23.5 really necessary?

@johannes-mueller
Copy link
Member


Is the spec. of numpy==1.23.5 really necessary?

It used to be necessary because numba had a problem with newer versions. Maybe they fixed it in the meantime and we can try to uplift the restriction.

I filed #39 in order to check.

@maierbn
Copy link
Contributor Author

maierbn commented Nov 2, 2023

Okay, seems like the numpy persion fix is required for now.. I now managed to install it with the restriction.
Still the docs won't build, I tried the following:

python -m pip install -e .[docs]    # was missing jupyter, therefore I added:
python -m pip install -e .[extras]

Then in docs directory:

make html

Now it complains about pandoc:

$ make html
Sphinx v7.2.6 in Verwendung
making output directory... erledigt
loading intersphinx inventory from http://www.sphinx-doc.org/en/master/objects.inv...
loading intersphinx inventory from https://docs.python.org/3.10/objects.inv...
loading intersphinx inventory from https://matplotlib.org/objects.inv...
loading intersphinx inventory from https://numpy.org/doc/stable/objects.inv...
loading intersphinx inventory from https://scikit-learn.org/stable/objects.inv...
loading intersphinx inventory from https://pandas.pydata.org/pandas-docs/stable/objects.inv...
loading intersphinx inventory from https://docs.scipy.org/doc/scipy/reference/objects.inv...
loading intersphinx inventory from https://pyscaffold.org/en/stable/objects.inv...
intersphinx inventory has moved: http://www.sphinx-doc.org/en/master/objects.inv -> https://www.sphinx-doc.org/en/master/objects.inv
intersphinx inventory has moved: https://matplotlib.org/objects.inv -> https://matplotlib.org/stable/objects.inv
intersphinx inventory has moved: https://docs.scipy.org/doc/scipy/reference/objects.inv -> https://docs.scipy.org/doc/scipy/objects.inv
[autosummary] generating autosummary for: 3rd-party-licenses.md, CHANGELOG.md, CODINGSTYLE.rst, CONTRIBUTING.md, INSTALLATION.md, LICENSE.md, NEWS-2.0.md, NOTICE.md, README.md, broadcaster.rst, ..., tutorials.rst, tutorials/stress-strength.rst, user_guide.rst, utils/functions.rst, utils/histogram.rst, utils/probability_data.rst, variable_names.rst, vmap/vmap.rst, vmap/vmap_export.rst, vmap/vmap_import.rst
WARNING (pytensor.tensor.blas): Using NumPy C-API based implementation for BLAS functions.
myst v2.0.0: MdParserConfig(commonmark_only=False, gfm_only=False, enable_extensions=set(), disable_syntax=[], all_links_external=False, url_schemes=('http', 'https', 'mailto', 'ftp'), ref_domains=None, fence_as_directive=set(), number_code_blocks=[], title_to_header=False, heading_anchors=0, heading_slug_func=None, html_meta={}, footnote_transition=True, words_per_minute=200, substitutions={}, linkify_fuzzy_links=True, dmath_allow_labels=True, dmath_allow_space=True, dmath_allow_digits=True, dmath_double_inline=False, update_mathjax=True, mathjax_classes='tex2jax_process|mathjax_process|math|output_area', enable_checkboxes=False, suppress_warnings=[], highlight_code_blocks=True)
building [mo]: targets for 0 po files that are out of date
writing output... 
building [html]: targets for 79 source files that are out of date
updating environment: [new config] 79 added, 0 changed, 0 removed
executing broadcaster13%] broadcaster
reading sources... [ 16%] demos/hotspot_beam
Notebook error:
PandocMissing in demos/hotspot_beam.nblink:
Pandoc wasn't found.
Please check that pandoc is installed:
https://pandoc.org/installing.html
Makefile:29: recipe for target 'html' failed
make: *** [html] Error 2

Installing it python -m pip install pandoc does not change anything. How is the documentation normally build? Maybe could we add a Github Action to check if it builds?

@johannes-mueller
Copy link
Member

How is the documentation normally build? Maybe could we add a Github Action to check if it builds?

It is normally built by readthedocs fetching the repo and build it. A github action to check if it builds sure would be a good thing, although it might not guarantee that it builds on readthedocs. I will look into this tomorrow.

@johannes-mueller
Copy link
Member

johannes-mueller commented Nov 22, 2023

Installing it python -m pip install pandoc does not change anything. How is the documentation normally build? Maybe could we add a Github Action to check if it builds?

You actually need to install the pandoc software itself on your host system. The pandoc package from PyPi is only the python bindings for pandoc.

In the meantime I merged #39 and #41 to develop. Can you please merge develop to trigger the renewed CI?

@maierbn
Copy link
Contributor Author

maierbn commented Nov 22, 2023

I merged develop and fixed the documentation build.

@johannes-mueller johannes-mueller self-requested a review November 28, 2023 13:27
@johannes-mueller
Copy link
Member

Squashed manually, thanks.

@johannes-mueller johannes-mueller deleted the fkm-nonlinear branch November 28, 2023 14:16
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.

2 participants