v3 MVP #165
Merged
v3 MVP #165
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…fetched via conan. This is needed for libraries using libqasm.
All these changes to V1 cannot finally go into develop. Otherwise we would be breaking the V1 parsing.
All these changes to V1 cannot finally go into develop. Otherwise we would be breaking the V1 parsing. test/v1x/parsing.cpp: - Changed vector of API levels used in semantic checks to use only '3.0'. - Changed the names of the registered instructions 'x90' and 'cnot' to 'X90' and 'CNOT', so that they are resolved correctly.
Updated v3 lexer and parser grammar files. Updated BuildTreeGenAstVisitor files so that the library compiles, although the new methods are yet unimplemented.
- changed 'analyze' function's ''file_parser' parameter name to 'parser', because the parser can actually invoke the file or the string parser. - minor fixes suggested by Clang-tidy.
At the moment, I'm just copy-pasting from the v1 code, and simplifying the contents by removing everything I think I won't need.
…s}.tree. At the moment, I'm just copy-pasting from the v1 code, and simplifying the contents by removing everything I think I won't need.
This reverts commit 96a9042.
- Use of nested namespaces. - Change some comments so that they have meaningful phrases per line.
- We have something that compiles. - After having added all the (I think needed) .tree and .hpp files. - I have tried not to reuse anything from v1x. For example, v3x/cqasm-values.tree defines cqasm::v3x::values/const_int, which is already defined in cqasm::v1x::values, with exactly the same logic. - My main concern is with the 'array' type in v3x/cqasm-types.tree. I don't think tree-gen allows to define something like a templated class, this is, an 'array<T>'. We would need this in order to consider 'array' as a type, so that we could have, for example, arrays of arrays of int (array<array<int>>). So, with tree-gen, if I'm not mistaken, we will be forced to define a specific type for every array type. E.g. qubit_array. Matrices should be a different type as well, as in v1x.
For the MVP, the only allowed types are qubit, bit, qubit_array, and bit_array.
- Moved read_file and write_file functions to utils.{hpp,cpp}.
- Moved register_tests function to test-register.hpp.
- Added cqasm::test namespace.
- test/v1x/parsing.cpp: fixed ParsingTest::TestBody method.
It was using 'api_version' 3.0 instead of 1.0, 1.1, and 1.2.
It was using 'X90' and 'CNOT' instead of 'x90' and 'cnot'.
…_SOURCES instead of CQASM_V1X_SOURCES.
Reorganized test folder to accommodate future v3x tests.
- Moved read_file and write_file functions to utils.{hpp,cpp}.
- Moved register_tests function to test-register.hpp.
- Added cqasm::test namespace.
- test/v1x/parsing.cpp: fixed ParsingTest::TestBody method.
It was using 'api_version' 3.0 instead of 1.0, 1.1, and 1.2.
It was using 'X90' and 'CNOT' instead of 'x90' and 'cnot'.
- Use of nested namespaces. - Change some comments so that they have meaningful phrases per line.
- Changed v3 grammar: qubit and bit array sizes can only be of type integer at the moment. - Changed tree-gen classes: - A variable has optionally a size (when it is of array type). - A measurement_instruction is not a subtype of an instruction (gate). - All v3 code refers now to v3 files and classes. - Added cqasm-analyzer, although the analysis is unimplemented. - All tests are passing
…ree. Changes to the grammar: - Changed measure_instruction into measure_statement. - A version number doesn't need now a minor number. Added src/v3x/cqasm-types.cpp and src/v3x/cqasm-values.cpp. Added test/v3x/parsing.cpp and registered v3x tests.
…n't use multiple declarations per line.
…t array, or index reference to one or many qubits), and one output operand (bit, bit array, or index reference to one or many bits).
… remain case-sensitive. The code calling them (v1x or v3x) can be case-insensitive by converting to lowercase before adding and resolving an overload.
Fixed some object slicing issues pointed out by clang-tidy (mainly assignments from One<T> to Maybe<T>).
Renamed utils::{lowercase,case_insensitive_equals} to utils::{to_lowercase,equal_case_insensitive}.
|
Hi @jvansomeren, Thanks for the comment! The implementation of v3 in Of course, I don't pretend either to break OpenQL support for v1.2. This PR has changed some v1 files, but the changes are minor: comments, clang-tidy suggestions, use of nested namespaces... The only "important" change is to have moded the Best regards, |
- we have removed the first_output_operand_index from an ast::Instruction, and - we have changed the error message for when the number of input indices and the number of output indices differ.
…ruction. This flag is false by default, and set to true for a measure instruction. Reimplemented check_input_indices_equals_output_indices as check_same_size_input_output_indices, without using std::span. Removed first_output_operand_index from a semantic AST instruction.
pablolh
reviewed
Nov 6, 2023
It seems a header in a Python library is defining things like STRING, and this macro expansion is hitting some enums in a different header in the ANTLR runtime library. Weird. This fix avoids v10 code to include v3x/cqasm.hpp.
Missing 'conan profile detect'.
- We have removed output_operands from an instruction.
Implemented operator== and operator<=> for Version.
Changed equal, less_than, more_than, less_than_or_equal, and more_than_or_equal to ==, <, >, <=, and >=.
Renamed Overload.{tag_,param_types_} to tag and param_types.
Made Analyzer::api_version public and removed accessor function.
pablolh
reviewed
Nov 10, 2023
|
looks good to me, please ping me know when/if I need to approve :) |
…it_indices_have_same_size. Used 'i' (for 'indices') instead of 'f' (for 'force' -to be equal, an old name for this flag-) when serializing request_qubit_and_bit_indices_have_same_size.
python/CMakeLists.txt: - Changed CMake minimum required version to 3.12. - Changed C++ standard to C++20 (like for libqasm). - Removed code that checked if CMake version was smaller than 3.12. - Deleted python/compat folder, which was only used when CMake version was smaller than 3.12. - Added v3x Python generated files to installation. Moved include/cqasm-py.hpp to include/v1x. Moved src/cqasm-py.cpp to src/v1x, and refactored code. Added include/v3x/cqasm-py.hpp. Added src/v3x/cqasm-py.cpp.
pablolh
approved these changes
Nov 13, 2023
|
Let's merge this and finalize in another PR (it's already too large haha) |
Oh, no, I'm still fighting with that, I have just started:
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
And then the toy v1 parser became a v3 MVP.
Implemented the
libqasmside of the v3 MVP.Most of the code has been reused from the v1 parser: tree files, include files, and source files.
Main differences lie on:
Analyzer::analyzeperforms the analysis through anAnalyzeTreeGenAstVisitor::visitProgramcall.qandbregisters anymore, and neither hasQubitRefsandBitRefs.Instead, we have
Qubit,QubitArray,Bit, andBitArraytypes, andIndexRefs, which will point to a variable of one of the mentioned types.The mapping of these qubit/bit variables to a physical qubit/bit register, and the semantic checks related to that mapping are not implemented at the
libqasmlevel, at least not yet.measureinstruction, with the syntax<bit references> = measure <qubit references>is implemented.Changes to v1x files
fmtformatters for types and values classes, and reimplementedoperator<<usingfmt::format.noexcept,[[nodiscard]]to method signatures.autotoconst auto &for many loop constructs.cqasm-analyzerto have only one constructor, which receives aVersion.semantic.1.x.golden.txtfiles becauseapi_versionis now dumped at the top of theProgrammembers, right beforeversion.less_than,more_than...).api_versionto the beginning of theprogramstructure incqasm-semantic.tree.res/v1x/parsingfolders by changing dashes to underscores, becausegtestdoesn't like test names with dashes.cqasm::v1x::analyzer).Changes to v3x files
res/v3x/parsingtest files. Many of these files were moved fromres/v1x/toy-v1x-parsing.test/parsing.cpp.Changes to common v1x/v3x files
equal,less_than,more_than,less_than_or_equal, andmore_than_or_equaltoVersion.test/cqasm-utils.cppto testto_lowercaseandequal_case_insensitivefunctions.Overloadtemplates frominclude/v1x/cqasm-resolvertoinclude/cqasm-overload.read_fileandwrite_filefunctions totest/utils.cpp.register_testscode, used both bytest/v1x/parsing.cppandtest/v3x/parsing.cpptotest/test-register.hpp.Changes to the build system
range-v3dependencies.src/CMakeLists.txtto fetch contentfmtandrange-v3in case the packages were not found.src/CMakeLists.txtto generate tree-gen classes for v3 (AST, types, values, and semantic AST).