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.

Sign up for GitHub

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

Implemented igraph #1196

Merged
merged 7 commits into from
Nov 1, 2024
Merged

Implemented igraph #1196

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f31965a
Implemented igraph to be used on android x86 64
carloscbl Jul 3, 2024
ec00473
removed unnecesary flag
carloscbl Jul 3, 2024
2e83cae
Standariced flags and paths, fixed to support nested ENVs, added igra…
carloscbl Jul 10, 2024
8254460
Apply suggestions from code review
mhsmith Oct 31, 2024
79a95f7
Merge branch 'master' into igraph
mhsmith Nov 1, 2024
dcca603
Update to igraph 0.11.8, and various fixes
mhsmith Nov 1, 2024
d08507c
Fix typos
mhsmith Nov 1, 2024
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
3 changes: 2 additions & 1 deletion server/pypi/build-wheel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,8 @@ def env_vars(self):
})

for var in self.meta["build"]["script_env"]:
key, value = var.split("=")
key, value = var.split("=",1)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This was failing because of finding
IGRAPH_CMAKE_EXTRA_ARGS=-DF2C_EXTERNAL_ARITH_HEADER=../../../../../../../android64_x86_64_arm64.h -DIEEE754_DOUBLE_ENDIANNESS_MATCHES=ON

Multiple "=", now will only take the first segment as key and the rest as value as is

print("DEBUG ENVS",key,value)
mhsmith marked this conversation as resolved.
Show resolved Hide resolved
env[key] = value

# We do this unconditionally, because we don't know whether the package requires
Expand Down
9 changes: 9 additions & 0 deletions server/pypi/packages/igraph/android64_x86_64_arm64.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#define IEEE_8087
Copy link
Member

Choose a reason for hiding this comment

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

Providing a header manually is OK if there's no simpler solution. But it should at least support x86_64 as well, because a lot of developers use emulators on that platform. That could be done with a single header file containing #ifdefs.

Also, is it really correct to define IEEE_8087 on ARM64?

Copy link
Member

Choose a reason for hiding this comment

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

Oh, I see from the filename that it's already supposed to cover both architectures. But there should probably still be some #ifdefs to only define the relevant things on each one.

Copy link
Contributor

Choose a reason for hiding this comment

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

Also, is it really correct to define IEEE_8087 on ARM64?

Yes, this is needed for f2c to work. Don't take the name too seriously.

Copy link
Member

@mhsmith mhsmith Oct 31, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

I guess you took this file from https://igraph.org/c/html/latest/igraph-Installation.html, which says it's for both ARM64 and x86, but on macOS. And all the Google search results for "IEEE_8087" do mostly return Apple-related things. So I'd like to see some evidence that these settings are also correct for Android.

It may also be possible to run the arithchk program mentioned in that link on an actual Android device to get the correct values. We've dealt with a similar situation before – see packages/chaquopy-hdf5/README.md.

Copy link
Contributor

Choose a reason for hiding this comment

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

The proper way to generate these headers is to run the arithchk program, if you can. The reason why that's not done automatically here (and we need pre-generated files) is that you are cross-compiling.

This f2c-based code is just a fallback. f2c hasn't had a release since 1995 as far as I know. In an ideal situation, one links to an external BLAS/LAPACK/ARPACK, but we still want to keep igraph easy to compile with minimal external dependencies (partly for use cases like this one), so we do keep the f2c-based code functional and treat it as a first-class configuration (regular tests, etc.) But we don't want to touch the innards of f2c and fix things like the name of this IEEE_8087 macro

Copy link
Member

Choose a reason for hiding this comment

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

We actually do have a build of OpenBLAS, and it's used by several other recipes. But I guess that doesn't include ARPACK, in which case f2c would still be required.

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,

Back in the day, i was unsure to use header from the website so what i did is to run arithchk in my Samsung and in my emulator, both resulted the same also we are using this on many builds with QA passed from some months now.

(At least 3-4 emulators and at least 5 different android has run this)

Still please do all the checks you consider necessary.

#define Arith_Kind_ASL 1
#define Long int
#define Intcast (int)(long)
#define Double_Align
#define X64_bit_pointers
#define NANCHECK
#define QNaN0 0x0
#define QNaN1 0x7ff80000
12 changes: 12 additions & 0 deletions server/pypi/packages/igraph/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package:
name: igraph
version: "0.11.5"


build:
number: 0
script_env:
# paralelize compilation
mhsmith marked this conversation as resolved.
Show resolved Hide resolved
- MAKEFLAGS=-j${CPU_COUNT}
- IGRAPH_CMAKE_EXTRA_ARGS=-DF2C_EXTERNAL_ARITH_HEADER=../../../../../../../android64_x86_64_arm64.h -DIEEE754_DOUBLE_ENDIANNESS_MATCHES=ON

51 changes: 51 additions & 0 deletions server/pypi/packages/igraph/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
import unittest


class TestIgraph(unittest.TestCase):

def testGraphCreation(self):
from igraph import Graph
g = Graph()
self.assertTrue(isinstance(g, Graph))
self.assertTrue(g.vcount() == 0 and g.ecount() == 0 and not g.is_directed())

g = Graph(3, [(0, 1), (1, 2), (2, 0)])
self.assertTrue(
g.vcount() == 3
and g.ecount() == 3
and not g.is_directed()
and g.is_simple()
)

g = Graph(2, [(0, 1), (1, 2), (2, 3)], True)
self.assertTrue(
g.vcount() == 4 and g.ecount() == 3 and g.is_directed() and g.is_simple()
)

g = Graph([(0, 1), (1, 2), (2, 1)])
self.assertTrue(
g.vcount() == 3
and g.ecount() == 3
and not g.is_directed()
and not g.is_simple()
)

g = Graph(((0, 1), (0, 0), (1, 2)))
self.assertTrue(
g.vcount() == 3
and g.ecount() == 3
and not g.is_directed()
and not g.is_simple()
)

g = Graph(8, None)
self.assertEqual(8, g.vcount())
self.assertEqual(0, g.ecount())
self.assertFalse(g.is_directed())

g = Graph(edges=None)
self.assertEqual(0, g.vcount())
self.assertEqual(0, g.ecount())
self.assertFalse(g.is_directed())

self.assertRaises(TypeError, Graph, edgelist=[(1, 2)])