Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
1425a79
Optimised the functions computing solid angles with apertures and mer…
Dec 2, 2022
46bcdfd
Fixed a bug and commented a 'with gil' block that was slowing down th…
Dec 2, 2022
0a74057
[#663] Minor changes
Didou09 Dec 5, 2022
bbed2bf
Merge branch 'devel' into Issue663_Optimize_sa_computation
Didou09 Dec 5, 2022
c1a3b17
[#663] Modified github action
Didou09 Dec 5, 2022
577b51f
[#663] Converging the two sets of Github Actions
Didou09 Dec 5, 2022
f9079c2
[#663] Removed support for MacOS, for test
Didou09 Dec 5, 2022
ac68d53
[#663] Trying to debug MacOS
Didou09 Dec 5, 2022
e24d005
[#663] Testing MacOS, full error msg
Didou09 Dec 5, 2022
1e93ece
[#663] Testing MacOS, full error msg 2
Didou09 Dec 5, 2022
8f0bf1a
[#663] Testing MacOS, full error msg 3
Didou09 Dec 5, 2022
63a5c03
Testing MacOS, full error msg 4
Dec 5, 2022
9fbb405
Testing MacOS, full error msg 5
Dec 5, 2022
0ff2bb5
Testing MacOS, full error msg 5
Dec 5, 2022
91763b2
Testing MacOS, full error msg 6
Dec 5, 2022
5228c2e
[#663] Testing MacOS, full error msg 7
Didou09 Dec 5, 2022
e0e6c54
[#663] Testing MacOS, full error msg 8
Didou09 Dec 5, 2022
721f5a9
[#663] Added action step to install llvm and clang
Didou09 Dec 5, 2022
417dbf7
[#663] Added action step to install llvm and clang 2
Didou09 Dec 5, 2022
9995cb9
Testing MacOS, full error msg 7
Dec 6, 2022
65b50c1
Fixed a type
Dec 6, 2022
a38c35f
Testing again on MacOS
Dec 6, 2022
4a2058e
Undid recent changes
Dec 6, 2022
4b6e529
Merge branch 'devel' into Issue663_Optimize_sa_computation
Didou09 Dec 8, 2022
5b86317
Merge branch 'Issue663_Optimize_sa_computation' of github.com:ToFuPro…
Didou09 Dec 8, 2022
f9ab6d1
[#663] new testing with brew install llvm libomp
Didou09 Dec 8, 2022
eda1229
Merge branch 'devel' into Issue663_Optimize_sa_computation
Didou09 Apr 11, 2023
a790e0f
Merge branch 'devel' into Issue663_Optimize_sa_computation
Didou09 Apr 11, 2023
3167ae1
Merge branch 'Issue739_SpectroReverseRT' into Issue663_Optimize_sa_co…
Didou09 Apr 11, 2023
9be659a
[#663] Testing vos with / without visibility
Didou09 Apr 11, 2023
4ba4b25
Merge branch 'Issue739_SpectroReverseRT' into Issue663_Optimize_sa_co…
Didou09 Apr 11, 2023
ee52dbd
Merge branch 'devel' into Issue663_Optimize_sa_computation
Didou09 Apr 12, 2023
6be382d
[#663] Added IF TOFU_OPENMP_ENABLED t import time in _GG.pyx
Didou09 Apr 12, 2023
6d59bf7
[#663] Test without openmp at import in compile time
Didou09 Apr 12, 2023
84d886e
[#663] Identified source of OPENMP issues with MacOS, commented for e…
Didou09 Apr 12, 2023
6c029d1
[#663] Testing solution to force link openmp to CLANG
Didou09 Apr 12, 2023
c761efb
[#663] Testing solution to force CPP to be CLANG 2
Didou09 Apr 12, 2023
7ceb8e9
[#663] Testing solution to force CPP to be CLANG 3
Didou09 Apr 12, 2023
96945b1
[#663] Testing solution to force CPP to be CLANG 4
Didou09 Apr 12, 2023
6356b48
[#663] Testing solution to force CPP to be CLANG 5
Didou09 Apr 12, 2023
94951fe
[#663] Testing solution to force CPP to be CLANG 6
Didou09 Apr 12, 2023
db4cf70
[#663] Testing solution to force CPP to be CLANG 7 + -fopenmp=libomp
Didou09 Apr 12, 2023
4e8d9b2
[#663] Testing solution to force CPP to be CLANG 8
Didou09 Apr 12, 2023
2cf88ae
[#663] Change strategy, try to install gcc on MacOS
Didou09 Apr 12, 2023
f6c43f8
[#663] Change strategy, try to install gcc on MacOS 2
Didou09 Apr 12, 2023
bbfe74a
[#663] Change strategy, try to install gcc on MacOS 3
Didou09 Apr 12, 2023
51066e9
[#663] Change strategy, try to install gcc on MacOS 4
Didou09 Apr 12, 2023
729e46e
[#663] Change strategy, try to install gcc on MacOS 5
Didou09 Apr 12, 2023
9737d3f
[#663] Change strategy, try to install gcc on MacOS 6
Didou09 Apr 12, 2023
e68b1df
[#663] Change strategy, try to install gcc on MacOS 7
Didou09 Apr 12, 2023
a8150b5
[#663] Change strategy, try to install gcc on MacOS 8
Didou09 Apr 12, 2023
c5658b5
[#663] Change strategy, try to install gcc on MacOS 9
Didou09 Apr 12, 2023
48d40ea
[#663] Change strategy, try to install gcc on MacOS 10
Didou09 Apr 12, 2023
211ec52
[#663] Change strategy, try to install gcc on MacOS 11
Didou09 Apr 12, 2023
2da7b97
[#663] Brian est secretement amoureux de Pamela
Didou09 Apr 12, 2023
49b20e9
[#663] Mais Pamela vit le grand amour avec Kimberley
Didou09 Apr 12, 2023
589d5be
[#663] Brian va zigouiller Kimberley
Didou09 Apr 12, 2023
46737dd
[#663] Il a code une IA tueuse en cython.... sur son Mac
Didou09 Apr 12, 2023
e9ae12b
[#663] Du coup ca compile pas et Kimberley s'en sort sans une egratig…
Didou09 Apr 12, 2023
6c29df3
[#663] Elle riposte avec une IA en Javascript tout bugge, sans succes…
Didou09 Apr 12, 2023
918f01f
[#663] Bref c'est la loose
Didou09 Apr 12, 2023
a7c51c0
[#663] J'en peux plus
Didou09 Apr 12, 2023
2be65bf
[#663] J'en peux plus 2
Didou09 Apr 12, 2023
5670396
[#663] J'en peux plus 3
Didou09 Apr 12, 2023
40af535
[#663] Ha, on arrive a forcer clang en faisant un set de la variable …
Didou09 Apr 12, 2023
1037a8b
[#663] On creuse une piste
Didou09 Apr 12, 2023
e19311f
[#663] On creuse une piste 2
Didou09 Apr 12, 2023
f013027
[#663] On creuse une piste 3
Didou09 Apr 12, 2023
4463753
[#663] setenv depuis tofu_helpers seulement
Didou09 Apr 13, 2023
e1f9c2e
Remove debug code
Apr 13, 2023
4bb4af8
Merge branch 'devel' into Issue663_Optimize_sa_computation
Didou09 Apr 24, 2023
f9e99f4
Merge branch 'devel' into Issue663_Optimize_sa_computation
Didou09 Sep 16, 2023
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
27 changes: 25 additions & 2 deletions .github/workflows/complete-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,17 @@ jobs:

strategy:
matrix:
os: [macOS-latest, ubuntu-latest, windows-latest]
python-version: ['3.7', '3.8', '3.9']
os: [macOS-latest] # , ubuntu-latest, windows-latest]
python-version: ['3.7'] #, '3.8', '3.9']

steps:
- uses: actions/checkout@v2
- name: Install LLVM and Clang
run: |
# brew uninstall --ignore-dependencies gcc
brew reinstall llvm
brew reinstall libomp
if: contains(matrix.os, 'macOS')
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
Expand All @@ -36,6 +42,23 @@ jobs:
flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
- name: install tofu
run: |
#export LDFLAGS="-L/usr/local/opt/llvm/lib/c++ -Wl,-rpath,/usr/local/opt/llvm/lib/c++"
#echo 'export PATH="/usr/local/opt/llvm/bin:$PATH"' >> /Users/runner/.bash_profile
#export LDFLAGS="-L/usr/local/opt/llvm/lib"
#export CPPFLAGS="-I/usr/local/opt/llvm/include"
#export CFLAGS+="-I/usr/lib/gcc/x86_64-linux-gnu/4.8/include/"
#export CPP=/usr/local/opt/llvm/bin/clang
#export CC=/usr/local/bin/clang
#export CFLAGS=-I${HOME}/include
#export LDFLAGS=-lboost
# export LDSHARED=/usr/local/bin/clang -shared
echo "CFLAGS: $CFLAGS"
echo "LDFLAGS: $LDFLAGS"
echo "CC: $CC"
echo "CXX: $CXX"
echo "CPP: $CPP"
echo "CPPFLAGS: $CPPFLAGS"
echo "LDSHARED: $LDSHARED"
pip install -e ".[dev]" --no-build-isolation
- name: Test with pytest and coverage
run: |
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/python-package-pip-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,16 @@ jobs:
- name: Add conda to system path
run: |
# $CONDA is an environment variable pointing to the root of the miniconda directory
echo $CONDA/bin >> $GITHUB_PATH
# echo $CONDA/bin >> $GITHUB_PATH
- name: Install dependencies
run: |
conda config --append channels conda-forge
# conda config --append channels conda-forge
pip install --upgrade pip
pip install pytest coverage wheel
pip install flake8 pytest coverage wheel
pip install -r requirements.txt # fix
# conda env update --file requirements.txt --name base
- name: Lint with flake8
run: |
conda install flake8
# stop the build if there are Python syntax errors or undefined names
# too many F82 errors, should uncomment the following line
# flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
Expand Down
4 changes: 2 additions & 2 deletions tofu/benchmarks/benchmarks_03_solidangles.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ class SolidAngle:
# Attributes reckognized by asv

# time before benchmark is killed
timeout = 500
repeat = (1, 10, 20.0)
timeout = 10
repeat = (1, 1, 20)
sample_time = 0.100

# -------------------------------------------------------
Expand Down
Loading