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

add tmap and ogdf #12498

Closed
wants to merge 52 commits into from
Closed
Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
7f7cd8b
add tmap
hadim Aug 28, 2020
faac33c
WIP
hadim Aug 28, 2020
8cb2176
WIP
hadim Aug 28, 2020
ae1b3cd
disable windows
hadim Aug 29, 2020
a9fda4e
fix ogdf version in tmap
hadim Aug 29, 2020
8baff5c
disable windows for tmap too
hadim Aug 29, 2020
c2564c3
add run exports
hadim Aug 29, 2020
7ab0439
remove ogdf in host
hadim Aug 29, 2020
6fdf720
remove ogdf in run
hadim Aug 29, 2020
0e091f0
fix run_export in ogdf recipe
hadim Aug 29, 2020
ca9b7be
re-add ogdf dep in run of tmap
hadim Aug 29, 2020
6dd2d04
add tests for ogdf
hadim Aug 31, 2020
a495e6b
WIP
hadim Aug 31, 2020
2010460
Update recipes/tmap/meta.yaml
hadim Aug 31, 2020
d14ff72
Update recipes/tmap/meta.yaml
hadim Aug 31, 2020
07df4df
Update recipes/tmap/meta.yaml
hadim Aug 31, 2020
45de07e
various fixes related to the review
hadim Aug 31, 2020
41cdd13
remove run_exports for ogdf
hadim Aug 31, 2020
e7d86fb
version tmap
hadim Aug 31, 2020
95496ed
Update recipes/tmap/meta.yaml
hadim Aug 31, 2020
de4d288
Update recipes/tmap/meta.yaml
hadim Aug 31, 2020
ebd4419
Update recipes/tmap/meta.yaml
hadim Aug 31, 2020
95329a5
Update recipes/tmap/meta.yaml
hadim Aug 31, 2020
7ca9606
Update recipes/tmap/meta.yaml
hadim Aug 31, 2020
64fda91
Update recipes/tmap/meta.yaml
hadim Aug 31, 2020
043b55f
Update bld.bat
hadim Aug 31, 2020
a54d74d
Update build.sh
hadim Aug 31, 2020
43761ed
Update build.sh
hadim Aug 31, 2020
a17bedb
Update meta.yaml
hadim Aug 31, 2020
3af3637
Update meta.yaml
hadim Aug 31, 2020
01ac6a0
more fixes
hadim Aug 31, 2020
8a57502
include more licenses for ogdf
hadim Aug 31, 2020
af42544
fix tests for osx on ogdf
hadim Aug 31, 2020
f9ca006
add ogdf license files into the recipe
hadim Aug 31, 2020
1f887c8
relax ogdf version in run of tmap
hadim Aug 31, 2020
5ce0a55
fix license path in ogdf
hadim Aug 31, 2020
0a10080
add new patch refering to a PR upstream for tmap
hadim Aug 31, 2020
2197384
add a patch for ogdf license files
hadim Aug 31, 2020
16e2f80
fix ogdf patch
hadim Aug 31, 2020
f2aa32d
fix ogdf patch
hadim Aug 31, 2020
0ed222e
add tests for tmap
hadim Aug 31, 2020
8e32e4b
typo
hadim Aug 31, 2020
aff3fab
new patches
hadim Aug 31, 2020
5fe3ea3
patch again
hadim Aug 31, 2020
91d6403
another try with licenses patch
hadim Aug 31, 2020
b41859e
add licenses for ogdf in recipe
hadim Sep 1, 2020
b8c620d
new patch for tmap and new licenses layout for ogdf
hadim Sep 1, 2020
d21aaeb
new patch for tmap
hadim Sep 1, 2020
1aabfd5
ENH try not deleting files
beckermr Sep 1, 2020
ac6e41b
edit diff for tmap
hadim Sep 1, 2020
c6e48dc
better diff
hadim Sep 1, 2020
b0a3891
newer osx sdk
hadim Sep 4, 2020
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
12 changes: 12 additions & 0 deletions recipes/ogdf/bld.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
md build
cd build

msbuild -version

set MAKEFLAGS=

cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%PREFIX%
if errorlevel 1 exit /b 1

cmake --build . --config Release --target install
if errorlevel 1 exit /b 1
13 changes: 13 additions & 0 deletions recipes/ogdf/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/bin/sh

mkdir build
cd build

if [ "$(uname)" == "Darwin" ]; then
cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${PREFIX} -DCMAKE_OSX_SYSROOT=${CONDA_BUILD_SYSROOT}
else
cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${PREFIX}
fi

make -j4
hadim marked this conversation as resolved.
Show resolved Hide resolved
make install
44 changes: 44 additions & 0 deletions recipes/ogdf/meta.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{% set name = "ogdf" %}
{% set version = "2020.02" %}


package:
name: {{ name|lower }}
version: {{ version }}

source:
url: https://github.com/ogdf/ogdf/archive/catalpa-202002.tar.gz
sha256: 32f3f943675e55d1a23e62293d016dc1644b1176271d60f41788ade60c2d3fc5

build:
number: 0
skip: True # [win]
hadim marked this conversation as resolved.
Show resolved Hide resolved
run_exports:
- {{ pin_subpackage('ogdf', max_pin='2020.02') }}
hadim marked this conversation as resolved.
Show resolved Hide resolved

requirements:
build:
- {{ compiler('cxx') }}
- cmake >=3.1
- make # [not win]
- ninja # [win]

hadim marked this conversation as resolved.
Show resolved Hide resolved
test:
commands:
- test -f $PREFIX/lib/libOGDF$SHLIB_EXT # [unix]
- if not exist %LIBRARY_LIB%\\libOGDF.lib exit 1 # [win]

about:
home: http://www.ogdf.net/
license: GPL-3.0-only
hadim marked this conversation as resolved.
Show resolved Hide resolved
license_file: LICENSE.txt
hadim marked this conversation as resolved.
Show resolved Hide resolved
summary: OGDF is a self-contained C++ class library for the automatic layout of diagrams

description: |
OGDF is a self-contained C++ class library for the automatic layout of diagrams.
doc_url: http://www.ogdf.net/doku.php
dev_url: https://github.com/ogdf/ogdf

extra:
recipe-maintainers:
- hadim
22 changes: 22 additions & 0 deletions recipes/tmap/01_bind2d_deprecated.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
diff --git a/tmap/tmap/analyse.cc b/tmap/tmap/analyse.cc
index b282b74..1d6e686 100644
--- a/tmap/tmap/analyse.cc
+++ b/tmap/tmap/analyse.cc
@@ -30,7 +30,7 @@ namespace {

std::vector<float> diff(weights.size());
std::transform(weights.begin(), weights.end(), diff.begin(),
- std::bind2nd(std::minus<float>(), mean));
+ std::bind(std::minus<float>(), std::placeholders::_1, mean));
float sq_sum = std::inner_product(diff.begin(), diff.end(), diff.begin(), 0.0);
float stdev = std::sqrt(sq_sum / weights.size());

@@ -64,7 +64,7 @@ namespace {

std::vector<float> diff(weights.size());
std::transform(weights.begin(), weights.end(), diff.begin(),
- std::bind2nd(std::minus<float>(), mean));
+ std::bind(std::minus<float>(), std::placeholders::_1, mean));
float sq_sum = std::inner_product(diff.begin(), diff.end(), diff.begin(), 0.0);
float stdev = std::sqrt(sq_sum / weights.size());

13 changes: 13 additions & 0 deletions recipes/tmap/02_setup_windows.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/tmap/setup.py b/tmap/setup.py
index 28c0d06..4d7e240 100644
--- a/tmap/setup.py
+++ b/tmap/setup.py
@@ -54,8 +54,6 @@ class CMakeBuild(build_ext):
cmake_args += [
"-DCMAKE_LIBRARY_OUTPUT_DIRECTORY_{}={}".format(cfg.upper(), extdir)
]
- if sys.maxsize > 2 ** 32:
- cmake_args += ["-A", "x64"]
build_args += ["--", "/m"]
elif platform.system() == 'Darwin':
cmake_args += ['-DOpenMP_C_FLAG=-fopenmp']
21 changes: 21 additions & 0 deletions recipes/tmap/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2020 Reymond Research Group, University of Bern and AstraZeneca

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
3 changes: 3 additions & 0 deletions recipes/tmap/bld.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
cd tmap
"%PYTHON%" setup.py install --prefix=%PREFIX%
if errorlevel 1 exit 1
4 changes: 4 additions & 0 deletions recipes/tmap/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/sh

cd tmap/
$PYTHON setup.py install
hadim marked this conversation as resolved.
Show resolved Hide resolved
62 changes: 62 additions & 0 deletions recipes/tmap/meta.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
{% set name = "tmap" %}
{% set version = "1.0.0" %}


package:
name: {{ name|lower }}
version: {{ version }}

source:
url: https://github.com/reymond-group/tmap/archive/9aa043dd1af022161048ee0a4b5554ec5e34977f.zip
hadim marked this conversation as resolved.
Show resolved Hide resolved
sha256: 56cf4f83d663950ab7ef41deb425b8e1c01de378fb5239aeef7b6613a6edf212

patches:
- 01_bind2d_deprecated.diff
- 02_setup_windows.diff

build:
number: 0
skip: True # [win]
binary_relocation: False # [osx]

requirements:
build:
- {{ compiler('cxx') }}
- python {{ python }}
- cmake >=3.1
- make # [not win]
- ninja # [win]
- llvm-openmp # [osx]
- libgomp # [linux]
- openmp # [win]
hadim marked this conversation as resolved.
Show resolved Hide resolved
- setuptools
- pybind11
- ogdf ==2020.02
hadim marked this conversation as resolved.
Show resolved Hide resolved
host:
- vc # [win]
- llvm-openmp # [osx]
- libgomp # [linux]
hadim marked this conversation as resolved.
Show resolved Hide resolved
- openmp # [win]
hadim marked this conversation as resolved.
Show resolved Hide resolved
- python
- pip
run:
- vc # [win]
hadim marked this conversation as resolved.
Show resolved Hide resolved
- llvm-openmp # [osx]
- libgomp # [linux]
hadim marked this conversation as resolved.
Show resolved Hide resolved
- openmp # [win]
hadim marked this conversation as resolved.
Show resolved Hide resolved
hadim marked this conversation as resolved.
Show resolved Hide resolved
- python
- ogdf
hadim marked this conversation as resolved.
Show resolved Hide resolved

test:
imports:
- tmap

about:
home: https://github.com/reymond-group/tmap
license: MIT
hadim marked this conversation as resolved.
Show resolved Hide resolved
license_file: LICENSE.txt
summary: 'A Python package for visualizing large, high-dimensional data sets.'

extra:
recipe-maintainers:
- hadim