Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
cmake_minimum_required(VERSION 3.20)
project(caribu LANGUAGES C CXX)

if(DEFINED ENV{SKIP_EXT})
message(STATUS "Skipping build of C/C++ extensions (SKIP_EXT set)")
return() # stops processing the CMakeLists here
endif()

set(CMAKE_C_STANDARD 17)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
Expand Down
4 changes: 0 additions & 4 deletions conda/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,11 @@ requirements:
- scikit-build-core
- setuptools
- wheel

build:
- {{ compiler('c') }}
- {{ compiler('cxx') }}
- cmake
- ninja
run:
- python
- path # path.py is outdated
- openalea.plantgl
- openalea.mtg

Expand Down
4 changes: 1 addition & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,7 @@ classifiers = [
"Topic :: Scientific/Engineering",
]
dynamic = ["version", "readme"]
dependencies = [
"path"
]
dependencies = []

[project.optional-dependencies]
test = ["pytest"]
Expand Down
15 changes: 8 additions & 7 deletions src/openalea/caribu/CaribuScene.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
from itertools import groupby, chain
from math import sqrt
from numbers import Number
from pathlib import Path

from openalea.mtg.mtg import MTG
from openalea.plantgl.all import Scene as pglScene, Viewer
Expand Down Expand Up @@ -286,18 +287,18 @@ def __init__(self, scene=None, light=None, pattern=None, opt=None,
z_soil = self.scene.getZmin()
self.soil = domain_mesh(self.pattern, z_soil, soil_mesh)

self.tempdir = '' # allow testing existence in __del__
self.tempdir = Path(' ') # allow testing existence in __del__
if filecache:
self.tempdir = tempfile.mkdtemp() if not debug else './caribuscene_'+str(id(self))
self.tempdir = Path(self.tempdir)
self.canfile = None
self.optfile = None


def __del__(self):
if hasattr(self, 'tempdir') and self.tempdir:
if os.path.exists(self.tempdir):
import shutil
shutil.rmtree(self.tempdir)
if self.tempdir.exists():
import shutil
shutil.rmtree(self.tempdir)



Expand Down Expand Up @@ -558,8 +559,8 @@ def run(self, direct=True, infinite=False, d_sphere=0.5, layers=10,
self.materialvalues = materials

if self.tempdir != '':
self.canfile = os.path.join(self.tempdir,'cscene.can')
self.optfile = os.path.join(self.tempdir,'band0.opt')
self.canfile = self.tempdir / 'cscene.can'
self.optfile = self.tempdir / 'band0.opt'
write_scene(triangles, materials, canfile = self.canfile, optfile = self.optfile)

else:
Expand Down
Loading
Loading