start to support windows #125

mattip · 2020-11-29T15:28:10Z

~~it passes one test, but fails to link on others.~~ Solved.

~~I think a libraries argument is needed on windows to make the linking happy~~ Solved
~~There is a problem with the %TEMP% path used in pytest, see TST: simplify source path names in compilation test numpy/numpy#17658~~ Solved

Support windows in build and tests

hpy/universal/src/ctx_meth.c

antocuni · 2020-12-09T15:18:01Z

test/test_argparse.py

@@ -12,7 +12,10 @@
 class TestParseItem(HPyTest):
    def make_parse_item(self, fmt, type, hpy_converter):
        mod = self.make_module("""
-            __attribute__((unused)) static inline


maybe we should hide this difference behind a macro and put it in hpy.h. It looks like a generally useful feature.

but hpy.h is not imported where the macro is needed

yes, it's included automatically by make_module:

hpy/test/support.py

Lines 56 to 61 in d5c8442

def expand(self):

self.defines_table = []

self.type_table = []

self.output = ['#include <hpy.h>']

for line in self.src.split('\n'):

match = self.r_marker.match(line)

mattip · 2021-02-22T19:21:16Z

I wonder what construct MSVC will support instead of HPy items[] = {};, which it errors out on.

// args is null, but kw is not, so we need to create an empty args tuple
// for CPython's PyObject_Call
HPy items[] = {};
HPy empty_tuple = HPyTuple_FromArray(ctx, items, 0);

…unction.

mattip · 2021-02-23T22:39:06Z

Happy for help if someone sees how to fix the int/long/long long failures. The current proof-of-concept failure is due to trying to set up a virtualenv where one already exists.

…hanges

mattip · 2021-02-25T20:35:20Z

It turns out the proof-of-concept run was confusing various virtual environments since it used VENV=... without declaring that a local variable.

This is evident when running the wheel() function: it first sets VENV, then calls _build_wheel. This sets VENV (overriding the value previously set), creates a virtualenv, and installs hpy and builds the poc wheel. Then _build_wheel exits. Now the wheel function creates a virtualenv, activates it, installs the poc wheel, and run tests. Note it did not install hpy into the virtualenv. Before this PR, that worked because the value of VENV set in _build_wheel changed the value set before the call to _build_wheel. Now that the VENV is local, running tests failed because hpy was not installed into the last virtualenv.

In 26ef55b I added a call to _install_hpy to fix this.

…repeat.

…e used to initialize HPy instances.

…n't recognise a cast as a constant expression.

…ing HPy_NULL).

…he file path, not str(path) with quotes around it.

…nce for MSVC.

stonebig · 2021-04-21T11:15:30Z

Can it be part of upcoming PyPy-7.3.5 64bit for Windows ? It could help for your May 11th PyCon Langage Summit presentation

hodgestar · 2021-04-21T12:03:07Z

Can it be part of upcoming PyPy-7.3.5 64bit for Windows ? It could help for your May 11th PyCon Langage Summit presentation

PyPy implements its own hpy.universal support so Windows support for HPy on PyPy is separate to the Windows support for HPy on CPython in this PR. I don't know offhand what the plans are for PyPy 7.3.5.

hodgestar

These are the issues that I think are still outstanding:

hodgestar · 2021-04-30T14:44:10Z

hpy/debug/src/debug_ctx.c

-__attribute__((unused)) static void hpy_magic_dump(HPy h)
+#ifndef _MSC_VER
+__attribute__((unused))
+#endif


We should define HPy_UNUSED in macros.h and then use that everywhere.

hodgestar · 2021-04-30T14:44:40Z

hpy/debug/src/include/hpy_debug.h

+// signature as HPy_MODINIT
+
+// Copied from Python's exports.h
+#ifndef Py_EXPORTED_SYMBOL


Should we call this HPy_EXPORTED_SYMBOL and add it to macros.h?

hodgestar · 2021-04-30T14:47:27Z

hpy/devel/include/common/hpytype.h

@@ -2,6 +2,11 @@
 #define HPY_UNIVERSAL_HPYTYPE_H

 #include <stdbool.h>
+#ifdef __GNUC__
+#define HPyAPI_UNUSED __attribute__((unused)) static inline


Perhaps this should also be moved to macros.h.

hodgestar · 2021-04-30T15:12:45Z

@mattip @antocuni I'm also happy to merge this PR and address the minor issues in a follow up PR.

mattip · 2021-05-01T00:46:15Z

Merging now and fixing up the other issues in subsequent PRs sounds good to me. This PR is already quite large.

hodgestar · 2021-05-01T07:06:08Z

Merged!

stonebig · 2023-10-01T08:43:56Z

There is no Windows wheel on pypi for hpy-0.9.0
Is it to happen only for 1.0 ?

mattip · 2023-10-01T13:10:43Z

The windows wheels are explicity excluded. Will this github workflow run without a tag, on a PR to debug the windows builds?

fangerer · 2023-10-11T11:58:45Z

Sorry for my late answer. When we've migrated to GitHub Workflows, building wheels for Windows using cibuildwheel did not work. Since then, we actually never tested. However, since we run tests on Windows as well, it should in theory work. If that's still something people are interested in, I can give it a try.

stonebig · 2023-10-11T17:58:11Z

Sorry for my late answer. When we've migrated to GitHub Workflows, building wheels for Windows using cibuildwheel did not work. Since then, we actually never tested. However, since we run tests on Windows as well, it should in theory work. If that's still something people are interested in, I can give it a try.

if hpy is to become a PEP, it would make sense to at least check it can generate a Windows wheel

mattip force-pushed the windows branch from 9fdbe19 to f9ab54d Compare November 29, 2020 15:30

antocuni reviewed Dec 9, 2020

View reviewed changes

rlamy mentioned this pull request Jan 13, 2021

Use HPy to define the ndarray type hpyproject/numpy-hpy#2

Merged

antocuni mentioned this pull request Jan 25, 2021

Don't use Variable Length Arrays (VLA) #157

Closed

start to support windows

ba87912

mattip force-pushed the windows branch from f9ab54d to ba87912 Compare February 22, 2021 19:11

mattip and others added 14 commits February 22, 2021 21:30

use HPy *a=NULL instead of HPy a[] = {}

4cf06a7

add ifdef guards for __attribute__

a64474b

azure script -> bash, tweak windows compilation

d758015

redo and fix 'unused' attribute

abb632b

python, not python3, is set on the path, add '/FS' compile flag

82696e9

typo

4e44aa3

add 'export' annotations to function

2f4c42b

compile in the tmp_dir to avoid windows creating too many directories

c3c2433

fix compilation warnings

429a8e1

typo to flip case

4e62fe1

Override build_ext.get_export_symbols to export the HPyInit_ module f…

10cf122

…unction.

Fix typo in _base_build_ext attribute.

0430521

only export HPyInit_* in universal mode

43e94f8

use Scripts not bin when activating venv, make signature equivalent

6c9d26e

mattip force-pushed the windows branch from 2bd4361 to 6c9d26e Compare February 23, 2021 22:28

mattip added 5 commits February 24, 2021 00:58

untangle _build_wheel's virtualenv

4e31b58

debug POF testing

449bc1b

fix argparse text for sizeof(long)==4, revert some proof-of-concept c…

e9be8b7

…hanges

install hpy into the new virtualenv for testing

26ef55b

error message fix

754b779

typo

bba5bb4

hodgestar added 18 commits April 19, 2021 00:10

Fix typo in h_doc declaration.

d038775

Use HPy_ssize_t for void* compatible integer type.

9915dd6

Explicitly cast HPy_ssize_t to long.

0c5aef7

Don't return a value from HPyFunc_RELEASEBUFFERPROC -- it returns void.

c5a1aa8

Explicitly cast HPy_ssize_t to long in test_sq_repeat_and_sq_inplace_…

fe28498

…repeat.

Explicitly cast void * to HPy_ssize_t before casting it to long.

dd98b1e

Attempt to convince MSVC that HPy_NULL is a constant so that it can b…

47ec162

…e used to initialize HPy instances.

Revert adding const to HPy_NULL #define.

92deaab

Set correct win32 fatal exit code.

c92a8d5

Don't cast the HPy_NULL constant to a specific type on MSC -- it does…

37a6432

…n't recognise a cast as a constant expression.

Revert removal of cast on HPy_NULL for MSC (it is required for return…

b967b87

…ing HPy_NULL).

Assign initial values after variable creation.

821f180

Fix assert on repr of module -- the file path should be the repr of t…

aea9fe3

…he file path, not str(path) with quotes around it.

Specify h_base, h_dict and h_doc separately.

8dcc996

Replace static initialization of h_FooError with an initialization da…

3ac3fe0

…nce for MSVC.

Only use ccache on OSes where we install ccache (i.e. Linux and Darwin).

89ef15e

Set python executable for Windows.

8de51db

Fix Windows Python executable location (tx mattip).

00e88f2

hodgestar reviewed Apr 30, 2021

View reviewed changes

hodgestar approved these changes May 1, 2021

View reviewed changes

hodgestar merged commit ee0e6b1 into hpyproject:master May 1, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

start to support windows #125

start to support windows #125

mattip commented Nov 29, 2020 •

edited

Loading

antocuni Dec 9, 2020

mattip Feb 22, 2021

antocuni Mar 8, 2021

mattip commented Feb 22, 2021

mattip commented Feb 23, 2021

mattip commented Feb 25, 2021

stonebig commented Apr 21, 2021 •

edited

Loading

hodgestar commented Apr 21, 2021

hodgestar left a comment

hodgestar Apr 30, 2021

hodgestar Apr 30, 2021

hodgestar Apr 30, 2021

hodgestar commented Apr 30, 2021

mattip commented May 1, 2021

hodgestar commented May 1, 2021

stonebig commented Oct 1, 2023

mattip commented Oct 1, 2023

fangerer commented Oct 11, 2023

stonebig commented Oct 11, 2023

	def expand(self):
	self.defines_table = []
	self.type_table = []
	self.output = ['#include <hpy.h>']
	for line in self.src.split('\n'):
	match = self.r_marker.match(line)

start to support windows #125

start to support windows #125

Conversation

mattip commented Nov 29, 2020 • edited Loading

antocuni Dec 9, 2020

Choose a reason for hiding this comment

mattip Feb 22, 2021

Choose a reason for hiding this comment

antocuni Mar 8, 2021

Choose a reason for hiding this comment

mattip commented Feb 22, 2021

mattip commented Feb 23, 2021

mattip commented Feb 25, 2021

stonebig commented Apr 21, 2021 • edited Loading

hodgestar commented Apr 21, 2021

hodgestar left a comment

Choose a reason for hiding this comment

hodgestar Apr 30, 2021

Choose a reason for hiding this comment

hodgestar Apr 30, 2021

Choose a reason for hiding this comment

hodgestar Apr 30, 2021

Choose a reason for hiding this comment

hodgestar commented Apr 30, 2021

mattip commented May 1, 2021

hodgestar commented May 1, 2021

stonebig commented Oct 1, 2023

mattip commented Oct 1, 2023

fangerer commented Oct 11, 2023

stonebig commented Oct 11, 2023

mattip commented Nov 29, 2020 •

edited

Loading

stonebig commented Apr 21, 2021 •

edited

Loading