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

fix: trigger doc build all condition #2242

Merged
merged 104 commits into from
Jan 27, 2025
Merged
Show file tree
Hide file tree
Changes from 98 commits
Commits
Show all changes
104 commits
Select commit Hold shift + click to select a range
e2fdedc
fix: trigger doc build all condition
Jan 6, 2025
aba7949
test-ci-fix: try not reset daalroot in doc.yml
Jan 7, 2025
4be9a0a
test-ci-fix: revert dalroot set in doc.yml
Jan 7, 2025
f979c5e
temp: print statements to pipline to see the sys path behavior
Jan 7, 2025
bc0b5c2
fix: add sklearn and daal4py folder to sys path
Jan 8, 2025
091f9d0
fix: revert change to conf.py
Jan 8, 2025
598b2c2
fix: confirm change needed in conf.py
Jan 8, 2025
8a6bbdf
fix: import daal4py and sklearn to path in conf.py for both daal4py a…
Jan 9, 2025
2344410
ci-print: remove useless print in doc.yml and sys.path import to avoi…
Jan 9, 2025
1c42d17
Merge branch 'main' into fix_build_doc_ci
Jan 10, 2025
edbcd5b
test-ci: additional print
Jan 10, 2025
0238639
fix: import build .so file
Jan 10, 2025
2bff139
fix: update intelex to include build dir as well
Jan 10, 2025
fdf20aa
fix: import build only test
Jan 10, 2025
b910ada
fix: test need the lib folder
Jan 10, 2025
81f96d9
fix: test add one dal to dep
Jan 10, 2025
afd1876
fix: remove unused env var
Jan 10, 2025
17dc7c9
test-ci: print the sys path library path
Jan 11, 2025
64b04a0
ci-test: remove some prints test import
Jan 13, 2025
6761c36
ci-test: print the import
Jan 13, 2025
ea567fd
ci-test: print
Jan 13, 2025
af4afc7
ci-test: print
Jan 13, 2025
b030f59
ci-test: print
Jan 13, 2025
8879aae
ci-test: cp so file
Jan 13, 2025
201f24e
fix: fix syntax
Jan 13, 2025
478d91d
ci-test: tprint
Jan 14, 2025
8d78736
ci-test: see if we have tbbroot
Jan 14, 2025
c148910
ci-test: setting tbb root
Jan 14, 2025
9c686f3
ci-test: print lib
yuejiaointel Jan 15, 2025
81a8827
ci-test: print lib
yuejiaointel Jan 15, 2025
b98d8fa
test-fix: cp so to intel64 folder
yuejiaointel Jan 15, 2025
ec7963b
fix: cp so file
yuejiaointel Jan 15, 2025
7d84a5a
fix: add ld libraryu path
yuejiaointel Jan 15, 2025
1f47fcd
fix: export ld lib path
yuejiaointel Jan 15, 2025
e692b4e
ci-test: print
yuejiaointel Jan 15, 2025
292ec21
ci-test: print
yuejiaointel Jan 15, 2025
2c6072a
ci-test: print
yuejiaointel Jan 15, 2025
c0b43cf
test: remove the cp to intel64 step
yuejiaointel Jan 15, 2025
2f66a1e
test: remove the cp to intel64 step
yuejiaointel Jan 15, 2025
b5f1a17
ci-test: print
yuejiaointel Jan 15, 2025
45ac490
ci-test: print
yuejiaointel Jan 15, 2025
e8c65cf
ci-test: print
yuejiaointel Jan 15, 2025
9bfc924
Merge branch 'main' into fix_build_doc_ci
yuejiaointel Jan 15, 2025
e21f176
fix: removed prints
yuejiaointel Jan 15, 2025
170578d
fix: build doc instead make html
yuejiaointel Jan 15, 2025
cf35d66
fix: add permisson for build doc.sh
yuejiaointel Jan 15, 2025
4081550
fix: add pakcagte install
yuejiaointel Jan 15, 2025
4cc3df4
feature: new rule in make to mark autodoc warnings as erros
Jan 16, 2025
1794499
fix: also print the logs at end
Jan 16, 2025
a3ba87b
fix: rever the env variables
Jan 16, 2025
3fdc354
fix: change main make rule instread adding a new rule
Jan 16, 2025
840eee1
fix: comnine apt get and remove useless source command
Jan 16, 2025
c68de58
fix: move warning detect from makefile to build-doc.sh and yml
Jan 16, 2025
42eb9b5
ci-test: print
Jan 16, 2025
d4276a6
ci-test: print
Jan 16, 2025
1229c77
ci-test: print
Jan 16, 2025
f78c8d2
ci-test: print
Jan 16, 2025
1478c48
fix: fix exclude command to not include daal4py_data_science.ipynb wh…
Jan 16, 2025
9ea61f5
fix: use --inplace flag for setup.py isntead
Jan 17, 2025
463b270
fix: remove cp command
Jan 17, 2025
12707fc
fneed dalroot
Jan 17, 2025
2e1aac3
ci-test: print
Jan 17, 2025
36a2b0c
ci-test: print
Jan 17, 2025
6528f6c
ci-test: print
Jan 17, 2025
527a78f
ci-test: print
Jan 17, 2025
4e61a01
ci-test: print
Jan 17, 2025
ca1488e
fix: remove build.sh
Jan 17, 2025
b9a2b0e
fix: add build.sh back
Jan 17, 2025
6a19911
fix: empty lines at end replace build.sh with another setup.py
Jan 17, 2025
5510307
fix: change make command in build-doc.sh
Jan 21, 2025
46dd884
ci-test: print
Jan 22, 2025
3a9cd88
ci-test: print
Jan 22, 2025
704f914
ci-test: print
Jan 22, 2025
e41e585
ci-test: print
Jan 22, 2025
5644758
fix: remove cd doc to avoid daal4py import mistakenly from doc
Jan 22, 2025
81940c4
ci-test: print
Jan 22, 2025
3c987ed
ci-test: print
Jan 22, 2025
69b68b3
ci-test: print
Jan 22, 2025
60597b1
ci-test: print
Jan 22, 2025
ff5fcac
ci-test: print
Jan 22, 2025
d8ce881
ci-test: print
Jan 22, 2025
f91a571
ci-test: print
Jan 22, 2025
d17cda5
ci-test: print
Jan 22, 2025
5ba6763
ci-test: print
Jan 22, 2025
ed6dd7e
ci-test: print
Jan 22, 2025
12d4ef0
ci-test: print
Jan 22, 2025
38e7c4d
fix: use build.sh to pritiorize sitepckage daal4py
Jan 22, 2025
070a43f
ci-test: print
Jan 22, 2025
0981db5
ci-test: print
Jan 22, 2025
b28cb49
fix: test fix with removing conf sys path add
Jan 24, 2025
42a341b
ci-test: print
Jan 24, 2025
c013425
ci-test: print
Jan 24, 2025
6f09283
ci-test: print
Jan 24, 2025
787a15d
ci-test: print
Jan 24, 2025
52fc776
ci-test: print
Jan 24, 2025
7682a2f
ci-test: print
Jan 24, 2025
71ed216
ci-test: test daal4py import fail warning would cause error in pipeline
Jan 24, 2025
c3df90a
ci-test: revert
Jan 24, 2025
43c671e
fix: revert branch
Jan 24, 2025
b7fcc0d
fix: revert make file
yuejiaointel Jan 24, 2025
228b49d
Merge branch 'fix_build_doc_ci' of https://github.com/yuejiaointel/sc…
Jan 24, 2025
0936b95
fix: remove unneccesry delete of line
Jan 24, 2025
f3c97bc
ci-test:print
yuejiaointel Jan 24, 2025
90bf972
ci-test:print
yuejiaointel Jan 24, 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
20 changes: 13 additions & 7 deletions .ci/pipeline/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@
trigger:
branches:
include:
- main
- rls/*
- "*"
david-cortes-intel marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Contributor

Choose a reason for hiding this comment

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

Please remember to change this before merging.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hi David,
Reverted
Best,
Yue

paths:
include:
- requirements-doc.txt
Expand Down Expand Up @@ -54,7 +53,7 @@ jobs:
inputs:
versionSpec: '3.11'
addToPath: true
- script: sudo apt-get update && sudo apt-get install -y clang-format
- script: sudo apt-get update && sudo apt-get install -y clang-format pandoc
displayName: 'apt-get'
- script: |
pip install daal-devel impi-devel
Expand All @@ -64,18 +63,25 @@ jobs:
pip list
displayName: 'Install requirements'
- script: |
export PREFIX=$(dirname $(dirname $(which python)))
export DALROOT=$PREFIX
export DALROOT=$(dirname $(dirname $(which python)))
export LD_LIBRARY_PATH=$(dirname $(dirname $(which python)))/lib:$LD_LIBRARY_PATH
david-cortes-intel marked this conversation as resolved.
Show resolved Hide resolved
./conda-recipe/build.sh
displayName: 'Build daal4py/sklearnex'
- script: |
export LD_LIBRARY_PATH=$(dirname $(dirname $(which python)))/lib:$LD_LIBRARY_PATH
cd doc/daal4py
make html
make html 2>&1 | tee build.log
david-cortes-intel marked this conversation as resolved.
Show resolved Hide resolved
cat build.log
# check for autodoc warnings
if grep -i "autodoc" build.log; then
echo "Autodoc Warnings detected, build failed!"
exit 1
fi
displayName: 'Build daal4py documentation'
- script: |
export LD_LIBRARY_PATH=$(dirname $(dirname $(which python)))/lib:$LD_LIBRARY_PATH
cd doc
make html
./build-doc.sh
displayName: 'Build scikit-learn-intelex documentation'
- script: |
mkdir $(Build.ArtifactStagingDirectory)/html/daal4py
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ daal4py.egg-info
doc/_build
doc/sources/samples/*.ipynb
doc/daal4py/_build/
doc/build.log
doc/daal4py/build.log
*.obj
*.pyd
build_oneapi_backend
Expand Down
6 changes: 3 additions & 3 deletions doc/build-doc.sh
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#===============================================================================

SAMPLES_DIR=sources/samples

# remove the samples folder if it exists
Expand All @@ -25,8 +24,9 @@ mkdir $SAMPLES_DIR

# copy jupyter notebooks
cd ..
rsync -a --exclude='doc/$SAMPLES_DIR/daal4py_data_science.ipynb' examples/notebooks/*.ipynb doc/$SAMPLES_DIR
david-cortes-intel marked this conversation as resolved.
Show resolved Hide resolved
rsync -a --exclude='daal4py_data_science.ipynb' examples/notebooks/*.ipynb doc/$SAMPLES_DIR

# build the documentation
cd doc
make html
export O="-W"
make html
2 changes: 1 addition & 1 deletion doc/daal4py/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ help:
# Catch-all target: route all unknown targets to Sphinx using the new
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
%: Makefile
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
david-cortes-intel marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Contributor

Choose a reason for hiding this comment

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

Looks like this file is not being modified. Please reset it to how it has before the PR so as not to mess the history.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed thx for the comment
Best,
Yue

6 changes: 3 additions & 3 deletions doc/daal4py/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
#
import os
import sys
# import os
# import sys

sys.path.insert(0, os.path.abspath("../.."))
# sys.path.insert(0, os.path.abspath("../.."))


# -- Project information -----------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions doc/sources/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
#
import os
# import os
import sys

sys.path.insert(0, os.path.abspath("../"))
# sys.path.insert(0, os.path.abspath("../"))


# -- Project information -----------------------------------------------------
Expand Down
Loading